tweaks for f21

diff --git a/build.sh b/build.sh
index 273d4b3..f096a25 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -7,6 +7,8 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2007 The Trustees of Princeton University
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2007 The Trustees of Princeton University
 #

+# Jan 2015 - f21 comes with isolinux 6.03 (was 4.05 in f20)
+# http://www.syslinux.org/wiki/index.php/ISOLINUX

 
 COMMAND=$(basename $0)
 DIRNAME=$(dirname $0)
 
 COMMAND=$(basename $0)
 DIRNAME=$(dirname $0)


@@ -30,9 +32,10 @@ GRAPHIC_CONSOLE="graphic"
 SERIAL_CONSOLE="ttyS0:115200:n:8"
 CONSOLE_INFO=$GRAPHIC_CONSOLE
 MKISOFS_OPTS="-R -J -r -f -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
 SERIAL_CONSOLE="ttyS0:115200:n:8"
 CONSOLE_INFO=$GRAPHIC_CONSOLE
 MKISOFS_OPTS="-R -J -r -f -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"

-#isolinux-debug.bin is supposedly helpful as well if available,
+# isolinux-debug.bin is supposedly helpful as well if available,

 # when things don't work as expected
 #MKISOFS_OPTS="-R -J -r -f -b isolinux-debug.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
 # when things don't work as expected
 #MKISOFS_OPTS="-R -J -r -f -b isolinux-debug.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"

+

 FREE_SPACE=4096
 
 # command-line settable args
 FREE_SPACE=4096
 
 # command-line settable args


@@ -250,7 +253,7 @@ function build_overlay () {
     # use new location as of fedora 12
     # used to be in /usr/lib/syslinux/isolinux.bin
     # removed backward compat in jan. 2015
     # use new location as of fedora 12
     # used to be in /usr/lib/syslinux/isolinux.bin
     # removed backward compat in jan. 2015

-    # as of syslinux 5.0 (fedora 21) ldlinux.c32 is required by isolinux.bin
+    # as of syslinux 6.05 (fedora 21) ldlinux.c32 is required by isolinux.bin

     # the debug version can come in handy at times, and is 40k as well
     isolinuxdir="/usr/share/syslinux"
     isolinuxfiles="isolinux.bin ldlinux.c32 isolinux-debug.bin memdisk"
     # the debug version can come in handy at times, and is 40k as well
     isolinuxdir="/usr/share/syslinux"
     isolinuxfiles="isolinux.bin ldlinux.c32 isolinux-debug.bin memdisk"


@@ -360,11 +363,8 @@ EOF
     KERNEL_ARGS="$KERNEL_ARGS biosdevname=0"
     # making sure selinux is turned off - somehow this is needed with lxc/f14
     KERNEL_ARGS="$KERNEL_ARGS selinux=0"
     KERNEL_ARGS="$KERNEL_ARGS biosdevname=0"
     # making sure selinux is turned off - somehow this is needed with lxc/f14
     KERNEL_ARGS="$KERNEL_ARGS selinux=0"

-# cannot use this mecahnism to set systemd default target because this applies to kexec boots as well
-#    # set default target for systemd
-#    KERNEL_ARGS="$KERNEL_ARGS systemd.unit=pl_boot.target"
-    # output more systemd-related messages on the console
-    KERNEL_ARGS="$KERNEL_ARGS systemd.log_target=console"
+    # output more systemd-related messages on the serial line so it gets with log.txt
+    KERNEL_ARGS="$KERNEL_ARGS systemd.log_target=console systemd.log_level=debug console=ttyS0,115200"

     # add any debug flag if any (defined in the header of this script)
     KERNEL_ARGS="$KERNEL_ARGS $KERNEL_DEBUG_ARGS"
     # propagate kernel args for later boot stages
     # add any debug flag if any (defined in the header of this script)
     KERNEL_ARGS="$KERNEL_ARGS $KERNEL_DEBUG_ARGS"
     # propagate kernel args for later boot stages


@@ -399,11 +399,13 @@ function build_iso() {
     # Write isolinux configuration
     cat >$ISOFS/isolinux.cfg <<EOF
 ${console_serial_line}
     # Write isolinux configuration
     cat >$ISOFS/isolinux.cfg <<EOF
 ${console_serial_line}

-DEFAULT kernel
-APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${KERNEL_ARGS}
-DISPLAY pl_version

 PROMPT 0
 PROMPT 0

-TIMEOUT 40
+DEFAULT planetlab-bootcd
+
+LABEL planetlab-bootcd
+  DISPLAY pl_version
+  LINUX kernel
+  APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${KERNEL_ARGS}

 EOF
 
     # Create ISO image
 EOF
 
     # Create ISO image


@@ -452,11 +454,13 @@ EOF
     tmp="${BUILDTMP}/syslinux.cfg"
     cat >$tmp <<EOF
 ${console_serial_line}
     tmp="${BUILDTMP}/syslinux.cfg"
     cat >$tmp <<EOF
 ${console_serial_line}

-DEFAULT kernel
-APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${KERNEL_ARGS}
-DISPLAY pl_version

 PROMPT 0
 PROMPT 0

-TIMEOUT 40
+DEFAULT planetlab-bootcd
+
+LABEL planetlab-bootcd
+  DISPLAY pl_version
+  LINUX kernel
+  APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${KERNEL_ARGS}

 EOF
     mdel -i "$usb" z:/isolinux.cfg 2>/dev/null || :
     mcopy -i "$usb" "$tmp" z:/syslinux.cfg
 EOF
     mdel -i "$usb" z:/isolinux.cfg 2>/dev/null || :
     mcopy -i "$usb" "$tmp" z:/syslinux.cfg


@@ -492,11 +496,13 @@ EOF
     tmp="${BUILDTMP}/syslinux.cfg"
     cat >$tmp <<EOF
 ${console_serial_line}
     tmp="${BUILDTMP}/syslinux.cfg"
     cat >$tmp <<EOF
 ${console_serial_line}

-DEFAULT kernel
-APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${KERNEL_ARGS}
-DISPLAY pl_version

 PROMPT 0
 PROMPT 0

-TIMEOUT 40
+DEFAULT planetlab-bootcd
+
+LABEL planetlab-bootcd
+  DISPLAY pl_version
+  LINUX kernel
+  APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${KERNEL_ARGS}

 EOF
     mdel -i "$usb" ::/isolinux.cfg 2>/dev/null || :
     mcopy -i "$usb" "$tmp" ::/syslinux.cfg
 EOF
     mdel -i "$usb" ::/isolinux.cfg 2>/dev/null || :
     mcopy -i "$usb" "$tmp" ::/syslinux.cfg


@@ -654,11 +660,13 @@ function build_iso_cramfs() {
     (cd $ISOFS && find . | grep -v "\.img$" | cpio -p -d -u $tmp/)
     cat >$tmp/isolinux.cfg <<EOF
 ${console_serial_line}
     (cd $ISOFS && find . | grep -v "\.img$" | cpio -p -d -u $tmp/)
     cat >$tmp/isolinux.cfg <<EOF
 ${console_serial_line}

-DEFAULT kernel
-APPEND ramdisk_size=$cramfs_size initrd=cramfs.img root=/dev/ram0 ro ${KERNEL_ARGS}
-DISPLAY pl_version

 PROMPT 0
 PROMPT 0

-TIMEOUT 40
+DEFAULT planetlab-bootcd
+
+LABEL planetlab-bootcd
+  DISPLAY pl_version
+  LINUX kernel
+  APPEND ramdisk_size=$ramdisk_size initrd=cramfs.img root=/dev/ram0 rw ${KERNEL_ARGS}

 EOF
 
     cp ${BUILDTMP}/cramfs.img $tmp
 EOF
 
     cp ${BUILDTMP}/cramfs.img $tmp


@@ -692,11 +700,13 @@ function build_usb_cramfs() {
     tmp="${BUILDTMP}/syslinux.cfg"
     cat >$tmp <<EOF
 ${console_serial_line}
     tmp="${BUILDTMP}/syslinux.cfg"
     cat >$tmp <<EOF
 ${console_serial_line}

-DEFAULT kernel
-APPEND ramdisk_size=$cramfs_size initrd=cramfs.img root=/dev/ram0 ro ${KERNEL_ARGS}
-DISPLAY pl_version

 PROMPT 0
 PROMPT 0

-TIMEOUT 40
+DEFAULT planetlab-bootcd
+
+LABEL planetlab-bootcd
+  DISPLAY pl_version
+  LINUX kernel
+  APPEND ramdisk_size=$ramdisk_size initrd=cramfs.img root=/dev/ram0 rw ${KERNEL_ARGS}

 EOF
 
     mcopy -bsQ -i "$usb" "$tmp" ::/syslinux.cfg
 EOF
 
     mcopy -bsQ -i "$usb" "$tmp" ::/syslinux.cfg


@@ -756,7 +766,7 @@ function main () {
 
     init_and_check
 
 
     init_and_check
 

-    echo "* Building images for $FULL_VERSION_STRING"
+    echo "* Building bootcd images for $NODE_CONFIGURATION_FILE ($FULL_VERSION_STRING) - $(date +%H-%M:%S)"

     # Do not tolerate errors
     set -e
     trap "do_cleanup" ERR INT EXIT
     # Do not tolerate errors
     set -e
     trap "do_cleanup" ERR INT EXIT


@@ -765,6 +775,7 @@ function main () {
     build_overlay
     build_types
 
     build_overlay
     build_types
 

+    echo "* Done with bootcd images for $NODE_CONFIGURATION_FILE - $(date +%H-%M:%S)"

     exit 0
 }
 
     exit 0
 }