X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=prep.sh;h=59b80aae2b81c5cd017602f495635ae26051b73d;hb=a1dc5376e0df2b95b1d3061f48352905f47b08ef;hp=473d25eb28d894158f0ea5a18e8c1d69f7d765a5;hpb=f40e9c9c3d86a0862308cbd6a999f3cb7d468253;p=bootcd.git

diff --git a/prep.sh b/prep.sh
index 473d25e..59b80aa 100755
--- a/prep.sh
+++ b/prep.sh
@@ -43,6 +43,7 @@ rpmquery --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 > build/v
 echo $nodefamily > build/nodefamily
 
 # Install base system
+echo "* Creating fedora root image"
 pl_root_makedevs $bootcd
 pkgsfile=$(pl_locateDistroFile ../build/ $pldistro bootcd.pkgs) 
 pl_root_mkfedora $bootcd $pldistro $pkgsfile
@@ -63,18 +64,6 @@ for file in pl_functions pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot
     install -D -m 755 initscripts/$file $bootcd/etc/init.d/$file
 done
 
-# Install systemd files
-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
-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
-
-
 # Install configuration files
 echo "* Installing configuration files"
 for file in fstab mtab modprobe.conf inittab hosts sysctl.conf ; do
@@ -91,8 +80,9 @@ if [ -d $bootcd/etc/event.d ] ; then
     # use our startup script in runlevel 2
     sed -i -e 's,/etc/rc\.d/rc[ \t][ \t]*2,/etc/init.d/pl_boot,g' rc2
     popd    
-elif [ -d $bootcd/etc/init ] ; then
+fi
 # ditto for f14 and higher init style
+if [ -d $bootcd/etc/init ] ; then
     echo "* Tuning /etc/init/ for upstart"
     pushd $bootcd/etc/init
     # use our system initialisation script
@@ -101,6 +91,15 @@ elif [ -d $bootcd/etc/init ] ; then
     sed -i -e 's,/etc/rc.d/rc[a-z\.]*,/etc/init.d/pl_boot,g' rc.conf
     popd    
 fi
+# Install systemd files for f16 and above
+if [ -d $bootcd/etc/systemd/system ] ; then
+    echo "* Installing systemd files"
+    for file in pl_boot.service pl_boot.target ; do
+	install -D -m 644 systemd/$file $bootcd/etc/systemd/system
+    done
+    # 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
+fi
 
 # Install fallback node configuration file
 echo "* Installing fallback node configuration file"