openstack
/
manila-test-image
Code Issues Proposed changes

Convert tabs to spaces 

Replace all tabs with 4 spaces, and re-enable bashate
warnings E002 and E003.

Change-Id: I11f3a9ca9b910555e1b1477c52288493f9bb0244
This commit is contained in:
Ben Swartzlander 2017-01-28 14:32:43 -05:00
parent bba826c7c8
commit 6f370f0608
7 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common-files/boot/extlinux.conf
View File

@ -2,4 +2,4 @@ default linux
label linux label linux
kernel /boot/bzImage kernel /boot/bzImage
append root=/dev/vda1 console=tty0 console=ttyS0,115200n8 clocksource=kvm-clock append root=/dev/vda1 console=tty0 console=ttyS0,115200n8 clocksource=kvm-clock

46
common-files/etc/init.d/S99metadata
View File

@ -1,35 +1,35 @@
#!/bin/sh #!/bin/sh
check_net() { check_net() {
url="http://169.254.169.254/2009-04-04/meta-data" url="http://169.254.169.254/2009-04-04/meta-data"
( (
wget -q -O - -T 10 $url/public-keys 2> /dev/null || exit 1 wget -q -O - -T 10 $url/public-keys 2> /dev/null || exit 1
echo echo
) | ( ) | (
while read line while read line
do do
key=$(echo $line | sed 's/\([0-9]\+\)=.*/\1/') key=$(echo $line | sed 's/\([0-9]\+\)=.*/\1/')
key_url=$url/public-keys/$key/openssh-key key_url=$url/public-keys/$key/openssh-key
wget -q -O - -T 10 $key_url 2> /dev/null || exit 1 wget -q -O - -T 10 $key_url 2> /dev/null || exit 1
done done
) >> authorized_keys ) >> authorized_keys
} }
json_metadata() { json_metadata() {
F=$1/ec2/2009-04-04/meta-data.json F=$1/ec2/2009-04-04/meta-data.json
[ -f $F ] || return [ -f $F ] || return
JSON.sh < $F | sed -n 's/^\["public-keys","[0-9]\+","openssh-key"\]\t"\(.*\)\\n"$/\1/p' JSON.sh < $F | sed -n 's/^\["public-keys","[0-9]\+","openssh-key"\]\t"\(.*\)\\n"$/\1/p'
} }
check_cd() { check_cd() {
[ -b /dev/sr0 ] || return [ -b /dev/sr0 ] || return
mkdir /tmp/cd mkdir /tmp/cd
if mount /dev/sr0 /tmp/cd if mount /dev/sr0 /tmp/cd
then then
json_metadata /tmp/cd >> authorized_keys json_metadata /tmp/cd >> authorized_keys
umount /tmp/cd umount /tmp/cd
fi fi
rmdir /tmp/cd rmdir /tmp/cd
} }
mkdir -p /root/.ssh mkdir -p /root/.ssh

4
common-files/etc/network/interfaces
View File

@ -6,5 +6,5 @@ auto eth0
iface eth0 inet dhcp iface eth0 inet dhcp
iface eth0 inet6 manual iface eth0 inet6 manual
up dhcpcd -b -6 eth0 up dhcpcd -b -6 eth0
down kill `cat /var/run/dhcpcd-eth0-6.pid` 2>/dev/null down kill `cat /var/run/dhcpcd-eth0-6.pid` 2>/dev/null

14
init-buildroot.sh
View File

@ -9,8 +9,8 @@
if which lsb_release 2> /dev/null && [ $(lsb_release -i -s) = "Ubuntu" ] if which lsb_release 2> /dev/null && [ $(lsb_release -i -s) = "Ubuntu" ]
then then
sudo apt-get -y install curl unzip bc python quilt parted qemu-utils \ sudo apt-get -y install curl unzip bc python quilt parted qemu-utils \
build-essential gcc-multilib build-essential gcc-multilib
fi fi
VERSION=2016.02 VERSION=2016.02
@ -19,20 +19,20 @@ FILENAME=buildroot-${VERSION}.tar.bz2
# Download buildroot if we don't have it already # Download buildroot if we don't have it already
if [ ! -f download/$FILENAME ] if [ ! -f download/$FILENAME ]
then then
wget -P download http://buildroot.org/downloads/$FILENAME wget -P download http://buildroot.org/downloads/$FILENAME
fi fi
# Untar buildroot if it's not already there # Untar buildroot if it's not already there
if [ ! -d buildroot ] if [ ! -d buildroot ]
then then
mkdir buildroot mkdir buildroot
tar -C buildroot -xf download/$FILENAME --strip 1 tar -C buildroot -xf download/$FILENAME --strip 1
fi fi
# Apply patches to buildroot if we haven't done so before # Apply patches to buildroot if we haven't done so before
PATCH_FLAG_FILE=buildroot/.manila-patches-applied PATCH_FLAG_FILE=buildroot/.manila-patches-applied
if [ ! -f $PATCH_FLAG_FILE ] if [ ! -f $PATCH_FLAG_FILE ]
then then
( cd buildroot ; QUILT_PATCHES=../patches quilt push -a ) ( cd buildroot ; QUILT_PATCHES=../patches quilt push -a )
touch $PATCH_FLAG_FILE touch $PATCH_FLAG_FILE
fi fi

14
make-bootable-disk.sh
View File

@ -12,8 +12,8 @@ BR_OUTPUT=output-$1
if [ -z "$DISK_NAME" ] if [ -z "$DISK_NAME" ]
then then
echo Specify disk name echo Specify disk name
exit 2 exit 2
fi fi
SIZE=120m SIZE=120m
@ -54,11 +54,11 @@ sudo $BR_OUTPUT/host/sbin/extlinux -z --install $MOUNT/boot
if [ $DISK_NAME = server ] if [ $DISK_NAME = server ]
then then
echo Creating share dir echo Creating share dir
SHARE_DIR=$MOUNT/share SHARE_DIR=$MOUNT/share
sudo mkdir -p $SHARE_DIR sudo mkdir -p $SHARE_DIR
sudo chmod 770 $SHARE_DIR sudo chmod 770 $SHARE_DIR
sudo chown 99:99 $SHARE_DIR sudo chown 99:99 $SHARE_DIR
fi fi
echo Unmounting filesystem echo Unmounting filesystem

28
run-buildroot.sh
View File

@ -14,25 +14,25 @@ JSON_VERS=e05e69a0debdba68125a33ac786726cb860b2e7b
JSON_SH=https://raw.githubusercontent.com/dominictarr/JSON.sh/$JSON_VERS/JSON.sh JSON_SH=https://raw.githubusercontent.com/dominictarr/JSON.sh/$JSON_VERS/JSON.sh
if [ ! -x download/JSON.sh ] if [ ! -x download/JSON.sh ]
then then
curl -s $JSON_SH > download/JSON.sh curl -s $JSON_SH > download/JSON.sh
chmod +x download/JSON.sh chmod +x download/JSON.sh
fi fi
# Create the filesystem overlays # Create the filesystem overlays
if [ ! -d overlay-client ] if [ ! -d overlay-client ]
then then
mkdir overlay-client mkdir overlay-client
cp -a common-files/* overlay-client cp -a common-files/* overlay-client
mkdir -p overlay-client/usr/bin mkdir -p overlay-client/usr/bin
cp download/JSON.sh overlay-server/usr/bin cp download/JSON.sh overlay-server/usr/bin
fi fi
if [ ! -d overlay-server ] if [ ! -d overlay-server ]
then then
mkdir overlay-server mkdir overlay-server
cp -a common-files/* overlay-server cp -a common-files/* overlay-server
cp -a server-files/* overlay-server cp -a server-files/* overlay-server
mkdir -p overlay-server/usr/bin mkdir -p overlay-server/usr/bin
cp download/JSON.sh overlay-server/usr/bin cp download/JSON.sh overlay-server/usr/bin
fi fi
# Copy the config files where they need to go (temporarily) # Copy the config files where they need to go (temporarily)
@ -46,7 +46,7 @@ BUILD_IMAGES="client server"
# Setup the build directories with their configs # Setup the build directories with their configs
for IMAGE in $BUILD_IMAGES for IMAGE in $BUILD_IMAGES
do do
make O=../output-${IMAGE} manila_${IMAGE}_defconfig make O=../output-${IMAGE} manila_${IMAGE}_defconfig
done done
# Remove the temporary configs # Remove the temporary configs
@ -55,6 +55,6 @@ rm configs/manila_*_defconfig
# Do the builds # Do the builds
for IMAGE in $BUILD_IMAGES for IMAGE in $BUILD_IMAGES
do do
make O=../output-${IMAGE} all make O=../output-${IMAGE} all
( cd .. ; ./make-bootable-disk.sh $IMAGE ) ( cd .. ; ./make-bootable-disk.sh $IMAGE )
done done

2
tox.ini
View File

@ -13,4 +13,4 @@ commands = bash -c "find {toxinidir} \
-not \( -type d -name buildroot -prune \) \ -not \( -type d -name buildroot -prune \) \
-not \( -type d -name download -prune \) \ -not \( -type d -name download -prune \) \
-type f -name \*.sh \ -type f -name \*.sh \
-print0 | xargs -0 bashate -v -iE002,E003,E010,E011" -print0 | xargs -0 bashate -v -iE010,E011"