From e446dbf789817429d3648fec50bb0c7e1b605e43 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 24 Apr 2015 12:12:53 +0200 Subject: [PATCH] remove default console=ttyS0,115200 and systemd.log_target=console from default kargs I suspect this is what was causing f21 bootCDs to remain silent --- build.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index eb2a79c..29aa5bf 100755 --- a/build.sh +++ b/build.sh @@ -259,7 +259,10 @@ function build_overlay () { # 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" + # 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 @@ -366,8 +369,6 @@ 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" - # output systemd-related messages on the serial line so it gets with log.txt - KERNEL_ARGS="$KERNEL_ARGS systemd.log_target=console 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 @@ -412,7 +413,11 @@ LABEL planetlab-bootcd EOF # Create ISO image - echo "* Creating ISO image in $(pwd)" + echo "* Generated isolinux.cfg -------------------- BEG" + cat $ISOFS/isolinux.cfg + echo "* Generated isolinux.cfg -------------------- END" + echo "* Creating ISO image in pwd=$(pwd)" + echo "* with command mkisofs -o $iso $MKISOFS_OPTS $ISOFS" mkisofs -o "$iso" $MKISOFS_OPTS $ISOFS } -- 2.43.0