From a4b5877607558325ef7bcdcf4e3e68d59e2787d9 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Thu, 29 Sep 2011 21:30:27 -0500 Subject: [PATCH] Minor fixes --- build_pxe_boot.sh | 3 ++- make_image.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build_pxe_boot.sh b/build_pxe_boot.sh index 6d264bd..a93e3f0 100755 --- a/build_pxe_boot.sh +++ b/build_pxe_boot.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # build_pxe_boot.sh - Create a PXE boot environment # # build_pxe_boot.sh [-k kernel-version] destdir @@ -54,6 +54,7 @@ if [ ! -r $OPWD/pxe/vmlinuz-${KVER} ]; then fi cp -p $OPWD/pxe/vmlinuz-${KVER} $DEST_DIR/ubuntu if [ ! -r $OPWD/pxe/stack-initrd.gz ]; then + cd $OPWD sudo $PROGDIR/build_pxe_ramdisk.sh $OPWD/pxe/stack-initrd.gz fi cp -p $OPWD/pxe/stack-initrd.gz $DEST_DIR/ubuntu diff --git a/make_image.sh b/make_image.sh index cfef136..81dd97c 100755 --- a/make_image.sh +++ b/make_image.sh @@ -44,7 +44,7 @@ while getopts CIhmr:s: c; do done 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 fi