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
8bfbb5a
..
0067611
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-6,7
+6,7
@@
# Marc E. Fiuczynski <mef@cs.princeton.edu>
# Copyright (C) 2005-2007 The Trustees of Princeton University
#
# Marc E. Fiuczynski <mef@cs.princeton.edu>
# Copyright (C) 2005-2007 The Trustees of Princeton University
#
-# $Id
: buildnode.sh,v 1.12.6.1 2007/08/30 20:09:20 mef Exp
$
+# $Id$
#
#
#
#
@@
-60,9
+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
-pkgsdir=$(dirname $pkgsfile)
-pkgsname=$(basename $pkgsfile .pkgs)
-postfile="${pkgsdir}/${pkgsname}.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=""
@@
-72,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
@@
-96,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!"
@@
-105,11
+107,8
@@
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
- pkgsdir=$(dirname $pkgs)
- pkgsname=$(basename $pkgs .pkgs)
- postfile="${pkgsdir}/${pkgsname}.post"
- [ -f $postfile ] && /bin/bash $postfile ${vdir} || :
-
+ 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
# 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