Merge "Fixed path for calling build_uec_ramdisk.sh from build_usb_boot.sh"

This commit is contained in:
Jenkins 2012-11-08 17:59:48 +00:00 committed by Gerrit Code Review
commit c7ac694090

View File

@ -11,7 +11,6 @@
DEST_DIR=${1:-/tmp/syslinux-boot} DEST_DIR=${1:-/tmp/syslinux-boot}
PXEDIR=${PXEDIR:-/opt/ramstack/pxe} PXEDIR=${PXEDIR:-/opt/ramstack/pxe}
PROGDIR=`dirname $0`
# Clean up any resources that may be in use # Clean up any resources that may be in use
cleanup() { cleanup() {
@ -81,7 +80,7 @@ fi
# Get image into place # Get image into place
if [ ! -r $PXEDIR/stack-initrd.img ]; then if [ ! -r $PXEDIR/stack-initrd.img ]; then
cd $TOP_DIR cd $TOP_DIR
$PROGDIR/build_uec_ramdisk.sh $PXEDIR/stack-initrd.img $TOOLS_DIR/build_uec_ramdisk.sh $PXEDIR/stack-initrd.img
fi fi
if [ ! -r $PXEDIR/stack-initrd.gz ]; then if [ ! -r $PXEDIR/stack-initrd.gz ]; then
gzip -1 -c $PXEDIR/stack-initrd.img >$PXEDIR/stack-initrd.gz gzip -1 -c $PXEDIR/stack-initrd.img >$PXEDIR/stack-initrd.gz