X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=prep.sh;h=8ea554a0d885ef1b3a741698f3f82b597cbcf6fa;hb=3a1395e98af9ff1604fb6ddb0f54c1dd2bba055e;hp=38f2a0bd3f5630681e6150da4f4509063ce28d86;hpb=d72a9e931dc589dd5f421a12177b3ac46f8fb0be;p=bootcd.git diff --git a/prep.sh b/prep.sh index 38f2a0b..8ea554a 100755 --- a/prep.sh +++ b/prep.sh @@ -92,19 +92,15 @@ if [ -d $bootcd/etc/init ] ; then popd fi # Install systemd files for f16 and above -# NOTE: pl_sysinit is actually invoked in the pl_boot service file -# ExecStartPre=/etc/init.d/pl_sysinit -# this is auick and dirty but does the job if [ -d $bootcd/etc/systemd/system ] ; then echo "* Installing systemd files" - for file in pl_boot.service pl_boot.target pl_sysinit.service pl_sysinit.target; do - install -D -m 644 systemd/$file $bootcd/lib/systemd/system + for file in pl_boot.service pl_boot.target ; do + install -D -m 644 systemd/$file $bootcd/etc/systemd/system done - ln -sf /lib/systemd/system/pl_boot.target $bootcd/etc/systemd/system/default.target - mkdir -p $bootcd/lib/systemd/system/pl_boot.target.wants - mkdir -p $bootcd/lib/systemd/system/pl_sysinit.target.wants - ln -sf /lib/systemd/system/pl_boot.service $bootcd/lib/systemd/system/pl_boot.target.wants/pl_boot.service - ln -sf /lib/systemd/system/pl_sysinit.service $bootcd/lib/systemd/system/pl_sysinit.target.wants/pl_sysinit.service + echo "* Enabling getty on tty2" + # select pl_boot target this way instead of using kargs, as kargs apply to kexec boot as well + ln -sf /etc/systemd/system/pl_boot.target $bootcd/etc/systemd/system/default.target + ln -sf /usr/lib/systemd/system/getty@.service $bootcd/etc/systemd/system/default.target.wants/getty@tty2.service fi # Install fallback node configuration file