X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=5ce3605ac67a7e335211f15a93e5c83d97a16576;hb=4bd97266e53cc34f98a57a18756152d1610a7961;hp=0d7dff17d92d402f5c8488fdfe2eb9635cc20691;hpb=fb6ffc1739a8dbb44acd7ee96cd607b2be3e7e6f;p=bootcd.git diff --git a/build.sh b/build.sh index 0d7dff1..5ce3605 100755 --- a/build.sh +++ b/build.sh @@ -7,13 +7,27 @@ # Mark Huang # Copyright (C) 2004-2007 The Trustees of Princeton University # -# $Id$ -# +# 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 @@ -21,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 @@ -30,7 +48,7 @@ OUTPUT_BASE= DRY_RUN="" OUTPUT_NAME="" TYPES="" -KARGS_STR="" +KERNEL_ARGS="" # various globals BUILDTMP="" @@ -43,7 +61,6 @@ console_dev="" console_baud="" console_spec="" console_serial_line="" -kernel_args="" #################### compute all supported types @@ -163,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 @@ -229,12 +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 - cp "/usr/lib/syslinux/isolinux.bin" "${BUILDTMP}/isofs" - ISOFS="${BUILDTMP}/isofs" # Root of the ISO and USB images echo "* Populating root filesystem..." @@ -322,6 +353,19 @@ EOF # build/passwd copied out by prep.sh sed -e "s@^root:[^:]*:\(.*\)@root:$ROOT_PASSWORD:\1@" ${VARIANT}/passwd >$OVERLAY/etc/passwd +# this is more harmful than helpful +# idea being, since we start a full-featured fedora system now, it would +# have been nice to be able to enter sshd very early on - before bm has even been downloaded +# however somehow it appears that these lines ruin all chances to enter ssh at all +# either early or even later on; +# plus, it is unclear what this would give on non=systemd nodes, so I am backing off for now +# # recent bootCDs rely on a standard systemd startup sequence +# # so allow debug key to enter in this context whenever that makes sense +# mkdir -p $OVERLAY/root/.ssh +# chmod 700 $OVERLAY/root/.ssh +# cp $PLC_DEBUG_SSH_KEY_PUB $OVERLAY/root/.ssh/authorized_keys +# chmod 600 $OVERLAY/root/.ssh/authorized_keys + # Install node configuration file (e.g., if node has no floppy disk or USB slot) if [ -f "$NODE_CONFIGURATION_FILE" ] ; then echo "* Installing node configuration file $NODE_CONFIGURATION_FILE -> /usr/boot/plnode.txt of the bootcd image" @@ -331,14 +375,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 +416,21 @@ function build_iso() { # Write isolinux configuration cat >$ISOFS/isolinux.cfg <${BUILDTMP}/mtools.conf<$tmp </dev/null || : mcopy -i "$usb" "$tmp" z:/syslinux.cfg rm -f "$tmp" - rm -f "${BUILDTMP}/mtools.conf" + rm -f "${MTOOLSRC}" unset MTOOLSRC echo "making USB image bootable." @@ -443,6 +503,12 @@ function build_usb() { rm -f "$usb" mkfs.vfat -C "$usb" $(($(du -Lsk $ISOFS | awk '{ print $1; }') + $FREE_SPACE)) + cat >${BUILDTMP}/mtools.conf<$tmp </dev/null || : mcopy -i "$usb" "$tmp" ::/syslinux.cfg rm -f "$tmp" + rm -f "${MTOOLSRC}" + unset MTOOLSRC echo "making USB image bootable." syslinux "$usb" @@ -533,9 +603,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 @@ -608,11 +681,13 @@ function build_iso_cramfs() { (cd $ISOFS && find . | grep -v "\.img$" | cpio -p -d -u $tmp/) cat >$tmp/isolinux.cfg <$tmp <