X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=29aa5bf0d60eec71fd66395a0e361d0971d9cd38;hb=e446dbf789817429d3648fec50bb0c7e1b605e43;hp=9fdf5ddf188ff7c0d482332278ee181d241b7b54;hpb=f94811b554f0ce284319ff37cb48c708c8b35bae;p=bootcd.git diff --git a/build.sh b/build.sh index 9fdf5dd..29aa5bf 100755 --- a/build.sh +++ b/build.sh @@ -7,11 +7,27 @@ # Mark Huang # 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) PATH=/sbin:/bin:/usr/sbin:/usr/bin +# debugging flags +# keep KERNEL_DEBUG_ARGS void for production +KERNEL_DEBUG_ARGS="" +# add more flags here for debugging +# KERNEL_DEBUG_ARGS="$KERNEL_DEBUG_ARGS some_other_kernel_arg" +# see also +# (*) GetBootMedium that has some provisions for common +# kargs, like e.g. for removing the hangcheck feature, +# or for turning on debug messages for systemd +# these can be turned on with tags on the node +# (*) tests default config, that uses this feature so +# the tests can benefit these features, without deploying +# them by default in production + # defaults DEFAULT_TYPES="usb iso" # Leave 4 MB of free space @@ -19,6 +35,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" +# 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" + FREE_SPACE=4096 # command-line settable args @@ -28,7 +48,7 @@ OUTPUT_BASE= DRY_RUN="" OUTPUT_NAME="" TYPES="" -KARGS_STR="" +KERNEL_ARGS="" # various globals BUILDTMP="" @@ -41,7 +61,6 @@ console_dev="" console_baud="" console_spec="" console_serial_line="" -kernel_args="" #################### compute all supported types @@ -161,7 +180,7 @@ function parse_command_line () { o) OUTPUT_NAME="$OPTARG" ;; C) CUSTOM_DIR="$OPTARG" ;; V) VARIANT="$OPTARG" ;; - k) KARGS_STR="$KARGS_STR $OPTARG" ;; + k) KERNEL_ARGS="$KERNEL_ARGS $OPTARG" ;; n) DRY_RUN=true ;; h|*) usage ;; esac @@ -227,14 +246,26 @@ function build_overlay () { BUILDTMP=$(mktemp -d ${BUILDTMP}/bootcd.XXXXXX) push_cleanup rm -fr "${BUILDTMP}" - mkdir "${BUILDTMP}/isofs" + + # initialize ISOFS + ISOFS="${BUILDTMP}/isofs" + mkdir -p "$ISOFS" for i in "$ISOREF"/isofs/{bootcd.img,kernel}; do - ln -s "$i" "${BUILDTMP}/isofs" + ln -s "$i" "$ISOFS" + done + # 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 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" + # ship only what is mandatory, and forget about + # (*) isolinux-debug.bin as its name confuses mkisofs + # (*) memdisk that is not useful + isolinuxfiles="isolinux.bin ldlinux.c32" + for isolinuxfile in $isolinuxfiles; do + [ -f $isolinuxdir/$isolinuxfile ] && cp $isolinuxdir/$isolinuxfile "${BUILDTMP}/isofs" done - # the syslinux that comes with f12 has this file in a new location - cp "/usr/lib/syslinux/isolinux.bin" "${BUILDTMP}/isofs" \ - || cp "/usr/share/syslinux/isolinux.bin" "${BUILDTMP}/isofs" - ISOFS="${BUILDTMP}/isofs" # Root of the ISO and USB images echo "* Populating root filesystem..." @@ -331,14 +362,17 @@ EOF plnet -- --root $OVERLAY --files-only --program BootCD $NODE_ID fi - if [ -n "$IS_SERIAL" ] ; then - KARGS_STR="$KARGS_STR ${console_spec}" - fi + [ -n "$IS_SERIAL" ] && KERNEL_ARGS="$KERNEL_ARGS ${console_spec}" - if [ -n "$KARGS_STR" ] ; then - echo "$KARGS_STR" > $OVERLAY/kargs.txt - kernel_args=$KARGS_STR - fi + # tmp: should be restricted to f15 nodes and above + # making sure the network interfaces are still numbered eth0 and above + 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" + # 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 + [ -n "$KERNEL_ARGS" ] && echo "$KERNEL_ARGS" > $OVERLAY/kargs.txt # Pack overlay files into a compressed archive echo "* Compressing overlay image" @@ -369,15 +403,21 @@ function build_iso() { # Write isolinux configuration cat >$ISOFS/isolinux.cfg <$tmp </dev/null || : mcopy -i "$usb" "$tmp" z:/syslinux.cfg @@ -462,11 +504,13 @@ EOF tmp="${BUILDTMP}/syslinux.cfg" cat >$tmp </dev/null || : mcopy -i "$usb" "$tmp" ::/syslinux.cfg @@ -546,9 +590,12 @@ EOF popd # update etc/inittab to start with pl_rsysinit - sed -i 's,pl_sysinit,pl_rsysinit,' etc/inittab + for file in etc/inittab etc/event.d/rcS etc/init/rcS.conf; do + [ -f $file ] && sed -i 's,pl_sysinit,pl_rsysinit,' $file + done # modify inittab to have a serial console + # xxx this might well be broken with f12 and above xxx if [ -n "$serial" ] ; then echo "T0:23:respawn:/sbin/agetty -L $console_dev $console_baud vt100" >> etc/inittab # and let root log in @@ -621,11 +668,13 @@ function build_iso_cramfs() { (cd $ISOFS && find . | grep -v "\.img$" | cpio -p -d -u $tmp/) cat >$tmp/isolinux.cfg <$tmp <