git://git.onelab.eu
/
bootstrapfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I meant for that to be vdir at this point in the script
[bootstrapfs.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
1326a6b
..
0a6c557
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-10,6
+10,14
@@
# $Id: buildnode.sh,v 1.12.6.1 2007/08/30 20:09:20 mef Exp $
#
# $Id: buildnode.sh,v 1.12.6.1 2007/08/30 20:09:20 mef Exp $
#
+
+#
+# This will build the Planetlab-Bootstrap.tar.bz2, which comprises
+# the base root image on the node, then create the ${NAME} bootstrap image
+# which is made up of just the additional files needed for a ${NAME} nodegroup
+# node.
+#
+
PATH=/sbin:/bin:/usr/sbin:/usr/bin
# In both a normal CVS environment and a PlanetLab RPM
PATH=/sbin:/bin:/usr/sbin:/usr/bin
# In both a normal CVS environment and a PlanetLab RPM
@@
-52,9
+60,15
@@
pl_root_makedevs $vref
pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
# -k = exclude kernel* packages
pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
# -k = exclude kernel* packages
-pl_root_mkfedora ${vref} -k -f $pkgsfile
+pl_root_mkfedora -k -f $pkgsfile ${vref}
+
+postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.post)
+[ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /bin/bash $postfile ${vref} || :
-for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
+# for distros that do not define bootstrapfs variants
+shopt -s nullglob
+pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc -l)
+[ $pkgs_count -gt 0 ] && for pkgs in $(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs); do
NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
echo "--------START BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
echo "--------START BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
@@
-78,10
+92,14
@@
for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
[ -n "$groups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $groups
if [ -f "${vdir}/proc/cpuinfo" ] ; then
[ -n "$groups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $groups
if [ -f "${vdir}/proc/cpuinfo" ] ; then
- echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!"
- umount ${vdir}/proc
+
echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!"
+
umount ${vdir}/proc
fi
fi
+ postfile=$(echo $pkgs | sed -e s,pkgs,post, )
+ [ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /bin/bash $postfile ${vdir} || :
+
+
# Create a copy of the ${NAME} bootstrap filesystem w/o the base
# bootstrap filesystem and make it smaller. This is a three step
# process:
# Create a copy of the ${NAME} bootstrap filesystem w/o the base
# bootstrap filesystem and make it smaller. This is a three step
# process:
@@
-109,7
+127,7
@@
for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
rm -rf ${vdir}
rm -f ${vdir}.changes
mv ${vdir}-tmp ${vdir}
rm -rf ${vdir}
rm -f ${vdir}.changes
mv ${vdir}-tmp ${vdir}
-
+
echo "--------STARTING tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)"
tar -cpjf ${pldistro}-filesystems/PlanetLab-Bootstrap-${NAME}.tar.bz2 -C ${vdir} .
echo "--------FINISHED tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)"
echo "--------STARTING tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)"
tar -cpjf ${pldistro}-filesystems/PlanetLab-Bootstrap-${NAME}.tar.bz2 -C ${vdir} .
echo "--------FINISHED tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)"
@@
-119,6
+137,7
@@
done
# Build the base Bootstrap filesystem
# clean out yum cache to reduce space requirements
yum -c ${vref}/etc/yum.conf --installroot=${vdir} -y clean all
# Build the base Bootstrap filesystem
# clean out yum cache to reduce space requirements
yum -c ${vref}/etc/yum.conf --installroot=${vdir} -y clean all
+
echo "--------STARTING tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"
tar -cpjf PlanetLab-Bootstrap.tar.bz2 -C ${vref} .
echo "--------FINISHED tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"
echo "--------STARTING tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"
tar -cpjf PlanetLab-Bootstrap.tar.bz2 -C ${vref} .
echo "--------FINISHED tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"