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
Setting tag BootstrapFS-1.0-9
[bootstrapfs.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
ee89cdf
..
646a2ec
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-60,7
+60,7
@@
pl_root_mkfedora ${vref} ${pldistro} $pkgsfile
# optionally invoke a post processing script after packages from
# $pkgsfile have been installed
# optionally invoke a post processing script after packages from
# $pkgsfile have been installed
-postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.post)
+postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.post
|| :
)
[ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vref} || : ; }
displayed=""
[ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vref} || : ; }
displayed=""
@@
-94,7
+94,11
@@
pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc
# Install the system vserver specific packages
[ -n "$packages" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y install $packages
# Install the system vserver specific packages
[ -n "$packages" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y install $packages
- [ -n "$groups" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y groupinstall $groups
+ for group_plus in $groups; do
+ group=$(echo $group_plus | sed -e "s,+++, ,g")
+ yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y groupinstall "$group"
+ done
+
if [ -f "${vdir}/proc/cpuinfo" ] ; then
echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!"
if [ -f "${vdir}/proc/cpuinfo" ] ; then
echo "WARNING: some RPM appears to have mounted /proc in ${NAME}. Unmounting it!"
@@
-103,7
+107,7
@@
pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc
# optionally invoke a post processing script after packages from
# $pkgs have been installed
# optionally invoke a post processing script after packages from
# $pkgs have been installed
- postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs-${NAME}.post)
+ postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs-${NAME}.post
|| :
)
[ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vdir} || : ; }
# Create a copy of the ${NAME} bootstrap filesystem w/o the base
[ -f $postfile ] && { echo "Running post install file $postfile" ; /bin/bash $postfile ${vdir} || : ; }
# Create a copy of the ${NAME} bootstrap filesystem w/o the base