X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=0067611c400483d6e937a4bf914e29397709bba7;hb=5d65a9a6a49bbc8d2256eb50eed1f0f0b4aa4300;hp=e4f4a1eb38c87c233e754e1732e684a22d5ecbe7;hpb=24d61f4c240728c405eb569c38382949a3847f2c;p=nodeimage.git diff --git a/build.sh b/build.sh index e4f4a1e..0067611 100755 --- 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-,,) - [ -z "$displayed" ] && echo "* Handling ${plistro} bootstrapfs extensions" + [ -z "$displayed" ] && echo "* Handling ${pldistro} bootstrapfs extensions" 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 - [ -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!"