git://git.onelab.eu
/
bootcd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
start with the simplest possible setup
[bootcd.git]
/
prep.sh
diff --git
a/prep.sh
b/prep.sh
index
4d45e76
..
0c6989a
100755
(executable)
--- 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 $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
pl_root_makedevs $bootcd
pkgsfile=$(pl_locateDistroFile ../build/ $pldistro bootcd.pkgs)
pl_root_mkfedora $bootcd $pldistro $pkgsfile
@@
-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
# 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
# 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
echo "* Tuning /etc/init/ for upstart"
pushd $bootcd/etc/init
# use our system initialisation script
@@
-89,6
+91,13
@@
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
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
+fi
# Install fallback node configuration file
echo "* Installing fallback node configuration file"
# Install fallback node configuration file
echo "* Installing fallback node configuration file"