X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=16adabde6c75874278a4e4b39c84c4c21486dc3b;hb=5db77cd2ee7f704b733091b223844d5b6b55dc9c;hp=51ba81375147234c2add4743fa046bcbdc767c4c;hpb=4107c190ec055aba6184a659c612212d86ee08b8;p=bootcd.git

diff --git a/build.sh b/build.sh
index 51ba813..16adabd 100755
--- a/build.sh
+++ b/build.sh
@@ -12,6 +12,10 @@ COMMAND=$(basename $0)
 DIRNAME=$(dirname $0)
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
+DEBUG_SYSTEMD=""
+# uncomment this on to get systemd's full log on console (slows things down)
+#DEBUG_SYSTEMD=true
+
 # defaults
 DEFAULT_TYPES="usb iso"
 # Leave 4 MB of free space
@@ -337,10 +341,13 @@ 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"
-    # set default target for systemd
-    KERNEL_ARGS="$KERNEL_ARGS systemd.unit=pl_boot.target"
+# 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_level=debug systemd.log_target=kmsg"
+    KERNEL_ARGS="$KERNEL_ARGS systemd.log_target=console"
+    # this slows down system init but is very helpful when e.g. trying to run on a new distro
+    [ -n "$DEBUG_SYSTEMD" ] && KERNEL_ARGS="$KERNEL_ARGS systemd.log_level=debug systemd.journald.forward_to_console=1"
     [ -n "$KERNEL_ARGS" ] && echo "$KERNEL_ARGS" > $OVERLAY/kargs.txt
 
     # Pack overlay files into a compressed archive