git://git.onelab.eu
/
vserver-reference.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the issue with ulogd seems to be related to mkfedora having lost its -k option somehow
[vserver-reference.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
c7ba063
..
de0d5ff
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-53,18
+53,14
@@
vref=${vrefdir}/${vrefname}
install -d -m 755 ${vref}
# "Parse" out the packages and groups for mkfedora
install -d -m 755 ${vref}
# "Parse" out the packages and groups for mkfedora
-options=""
lst="vserver-reference.lst"
lst="vserver-reference.lst"
-vrefpackages=$(pl_getPackages $lst)
-vrefgroups=$(pl_getGroups $lst)
-for package in ${vrefpackages} ; do options="$options -p $package"; done
-for group in ${vrefgroups} ; do options="$options -g $group"; done
+options="$(pl_getPackagesOptions $lst) $(pl_getGroupsOptions $lst)"
# Populate a minimal /dev in the reference image
pl_makedevs ${vref}
# Populate image with vserver-reference packages
# Populate a minimal /dev in the reference image
pl_makedevs ${vref}
# Populate image with vserver-reference packages
-pl_setup_chroot ${vref} ${options}
+pl_setup_chroot ${vref} ${options}
-k
for systemvserver in reference-vservers/*.lst ; do
NAME=$(basename $systemvserver .lst)
for systemvserver in reference-vservers/*.lst ; do
NAME=$(basename $systemvserver .lst)
@@
-87,8
+83,7
@@
for systemvserver in reference-vservers/*.lst ; do
echo ${vrefname} > ${vdir}.cloned
# Install the system vserver specific packages
echo ${vrefname} > ${vdir}.cloned
# Install the system vserver specific packages
- # xxx - thierry -adding disablerepo for closing the build loop - should be solved some other way
- [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} --disablerepo=extras -y install $systempackages
+ [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
[ -n "$systemgroups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $systemgroups
# Create a copy of the system vserver w/o the vserver reference files and make it smaller.
[ -n "$systemgroups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $systemgroups
# Create a copy of the system vserver w/o the vserver reference files and make it smaller.