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

diff --git a/prep.sh b/prep.sh
index f25e390..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
@@ -58,7 +59,7 @@ install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac
 
 # Install initscripts
 echo "* Installing initscripts"
-for file in pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot ; do
+for file in pl_functions pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot ; do
     sed -i -e "s,@PLDISTRO@,$pldistro,g" -e "s,@FCDISTRO@,$fcdistro,g" initscripts/$file
     install -D -m 755 initscripts/$file $bootcd/etc/init.d/$file
 done
@@ -79,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
@@ -89,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"