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
3-fold nodefamily now has fcdistro as well
[bootstrapfs.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
e4f4a1e
..
0067611
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-70,7
+70,7
@@
pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc
[ $pkgs_count -gt 0 ] && for pkgs in $(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs); do
NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
[ $pkgs_count -gt 0 ] && for pkgs in $(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs); do
NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
- [ -z "$displayed" ] && echo "* Handling ${plistro} bootstrapfs extensions"
+ [ -z "$displayed" ] && echo "* Handling ${pl
d
istro} bootstrapfs extensions"
displayed=true
extension_plain=bootstrapfs-${NAME}-${pl_DISTRO_ARCH}.tar
displayed=true
extension_plain=bootstrapfs-${NAME}-${pl_DISTRO_ARCH}.tar
@@
-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!"