git://git.onelab.eu
/
vserver-reference.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified to execute config.planetlab/vserver.post scripts to perform final
[vserver-reference.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
b426b16
..
f92857e
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-59,10
+59,16
@@
install -d -m 755 ${vref}
# locate the packages and groups file
pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.pkgs)
# locate the packages and groups file
pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.pkgs)
+# Some of the PlanetLab RPMs attempt to (re)start themselves in %post,
+# unless the installation is running inside the BootCD environment. We
+# would like to pretend that we are.
+export PL_BOOTCD=1
+
# Populate image with vserver-reference packages
pl_root_setup_chroot ${vref} -k -f $pkgsfile
# Populate image with vserver-reference packages
pl_root_setup_chroot ${vref} -k -f $pkgsfile
-for systemvserver in ../build/config.${pldistro}/vserver-*.pkgs ; do
+systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null | wc -l)
+[ $systemvserver_count -gt 0 ] && for systemvserver in $(ls ../build/config.${pldistro}/vserver-*.pkgs) ; do
NAME=$(basename $systemvserver .pkgs | sed -e s,vserver-,,)
echo "--------START BUILDING system vserver ${NAME}: $(date)"
NAME=$(basename $systemvserver .pkgs | sed -e s,vserver-,,)
echo "--------START BUILDING system vserver ${NAME}: $(date)"
@@
-86,6
+92,9
@@
for systemvserver in ../build/config.${pldistro}/vserver-*.pkgs ; do
[ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
[ -n "$systemgroups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $systemgroups
[ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
[ -n "$systemgroups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $systemgroups
+ postfile=$(pl_locateDistroFile ../build/ ${pldistro} vserver.post)
+ [ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /bin/bash $postfile ${vdir} || :
+
# Create a copy of the system vserver w/o the vserver reference files and make it smaller.
# This is a three step process:
# Create a copy of the system vserver w/o the vserver reference files and make it smaller.
# This is a three step process: