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
Im not sure what I'm doing but mef says this is how to make these changes.
[bootstrapfs.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
75292e6
..
213fe66
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-62,7
+62,10
@@
pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
# -k = exclude kernel* packages
pl_root_mkfedora -k -f $pkgsfile ${vref}
# -k = exclude kernel* packages
pl_root_mkfedora -k -f $pkgsfile ${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)"
@@
-95,12
+98,6
@@
for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
chroot ${vdir} /sbin/chkconfig $service off
done
chroot ${vdir} /sbin/chkconfig $service off
done
- # Disable splaying of cron.
- echo > ${vref}/etc/sysconfig/crontab
-
- # Add site_admin account
- chroot ${vref} /usr/sbin/useradd -p "" -u 502 -m site_admin
-
# 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:
@@
-138,6
+135,13
@@
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
+
+# Disable splaying of cron.
+echo > ${vref}/etc/sysconfig/crontab
+
+# Add site_admin account
+chroot ${vref} /usr/sbin/useradd -p "" -u 502 -m site_admin
+
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)"