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
213fe66
..
0a6c557
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-62,6
+62,9
@@
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}
+postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.post)
+[ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /bin/bash $postfile ${vref} || :
+
# for distros that do not define bootstrapfs variants
shopt -s nullglob
pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc -l)
# for distros that do not define bootstrapfs variants
shopt -s nullglob
pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc -l)
@@
-93,10
+96,9
@@
pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc
umount ${vdir}/proc
fi
umount ${vdir}/proc
fi
- # Remove unneeded services
- for service in util-vserver vprocunhide vservers-default; do
- chroot ${vdir} /sbin/chkconfig $service off
- done
+ 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
# Create a copy of the ${NAME} bootstrap filesystem w/o the base
# bootstrap filesystem and make it smaller. This is a three step
@@
-136,12
+138,6
@@
done
# clean out yum cache to reduce space requirements
yum -c ${vref}/etc/yum.conf --installroot=${vdir} -y clean all
# 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)"