openstack/devstack
Code Issues Proposed changes

Minor fixes

Browse Source
This commit is contained in:
Dean Troyer 2011-09-29 21:30:27 -05:00
parent 783cc7774f
commit a4b5877607
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_pxe_boot.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash -e
# build_pxe_boot.sh - Create a PXE boot environment # build_pxe_boot.sh - Create a PXE boot environment
# #
# build_pxe_boot.sh [-k kernel-version] destdir # build_pxe_boot.sh [-k kernel-version] destdir
@ -54,6 +54,7 @@ if [ ! -r $OPWD/pxe/vmlinuz-${KVER} ]; then
fi fi
cp -p $OPWD/pxe/vmlinuz-${KVER} $DEST_DIR/ubuntu cp -p $OPWD/pxe/vmlinuz-${KVER} $DEST_DIR/ubuntu
if [ ! -r $OPWD/pxe/stack-initrd.gz ]; then if [ ! -r $OPWD/pxe/stack-initrd.gz ]; then
cd $OPWD
sudo $PROGDIR/build_pxe_ramdisk.sh $OPWD/pxe/stack-initrd.gz sudo $PROGDIR/build_pxe_ramdisk.sh $OPWD/pxe/stack-initrd.gz
fi fi
cp -p $OPWD/pxe/stack-initrd.gz $DEST_DIR/ubuntu cp -p $OPWD/pxe/stack-initrd.gz $DEST_DIR/ubuntu

2
make_image.sh
View File

@ -44,7 +44,7 @@ while getopts CIhmr:s: c; do
done done
shift `expr $OPTIND - 1` shift `expr $OPTIND - 1`
if [ ! "$#" -eq "2" -o -n $CHROOTONLY -a -n $IMAGEONLY ]; then if [ ! "$#" -eq "2" -o -n "$CHROOTONLY" -a -n "$IMAGEONLY" ]; then
usage usage
fi fi