attempt to fix build/version.txt in bootcd image

[bootcd.git] / prep.sh

diff --git a/prep.sh b/prep.sh
index 38f2a0b..ba985b9 100755 (executable)
--- a/prep.sh
+++ b/prep.sh
@@ -39,7 +39,7 @@ bootcd=$PWD/build/bootcd
 install -d -m 755 $bootcd
 
 # Write version number
-rpmquery --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 > build/version.txt
+rpm -q --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 > build/version.txt
 echo $nodefamily > build/nodefamily
 
 # Install base system
@@ -92,19 +92,16 @@ 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
+    [ -d $bootcd/etc/systemd/system/default.target.wants ] || mkdir -p $bootcd/etc/systemd/system/default.target.wants
+    ln -sf /usr/lib/systemd/system/getty@.service $bootcd/etc/systemd/system/default.target.wants/getty@tty2.service
 fi
 
 # Install fallback node configuration file