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
switch to using pl_get{Packages,Groups}
[vserver-reference.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
19dc82c
..
bbef6ee
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-53,9
+53,10
@@
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
-vrefpackages=$(grep "^package:.*" vserver-reference.lst | awk '{print $2}')
-vrefgroups=$(grep "^group:.*" vserver-reference.lst | awk '{print $2}')
options=""
options=""
+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
for package in ${vrefpackages} ; do options="$options -p $package"; done
for group in ${vrefgroups} ; do options="$options -g $group"; done
@@
-71,16
+72,14
@@
for systemvserver in reference-vservers/*.lst ; do
echo "--------START BUILDING system vserver ${NAME}: $(date)"
# "Parse" out the packages and groups for yum
echo "--------START BUILDING system vserver ${NAME}: $(date)"
# "Parse" out the packages and groups for yum
- systempackages=$(
grep "^package:.*" $systemvserver | awk '{print $2}'
)
- systemgroups=$(
grep "^group:.*" $systemvserver | awk '{print $2}'
)
+ systempackages=$(
pl_getPackages $systemvserver
)
+ systemgroups=$(
pl_getGroups $systemvserver
)
vdir=${vstubdir}/${NAME}
rm -rf ${vdir}/*
install -d -m 755 ${vdir}
# Clone the base vserver reference to the system vserver reference
vdir=${vstubdir}/${NAME}
rm -rf ${vdir}/*
install -d -m 755 ${vdir}
# Clone the base vserver reference to the system vserver reference
-
- # OPTIMIZATION: Consider using "cp -al" in the future
(cd ${vref} && find . | cpio -m -d -u -p ${vdir})
rm -f ${vdir}/var/lib/rpm/__db*
(cd ${vref} && find . | cpio -m -d -u -p ${vdir})
rm -f ${vdir}/var/lib/rpm/__db*
@@
-94,7
+93,10
@@
for systemvserver in reference-vservers/*.lst ; do
# Create a copy of the system vserver w/o the vserver reference files and make it smaller.
# This is a three step process:
# Create a copy of the system vserver w/o the vserver reference files and make it smaller.
# This is a three step process:
- # step 1: figure out the new/changed files in ${vdir} vs. ${vref} and compute ${vdir}.changes
+ # step 1: clean out yum cache to reduce space requirements
+ yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y clean all
+
+ # step 2: figure out the new/changed files in ${vdir} vs. ${vref} and compute ${vdir}.changes
rsync -anv ${vdir}/ ${vref}/ > ${vdir}.changes
linecount=$(wc -l ${vdir}.changes | awk ' { print $1 } ')
let headcount=$linecount-3
rsync -anv ${vdir}/ ${vref}/ > ${vdir}.changes
linecount=$(wc -l ${vdir}.changes | awk ' { print $1 } ')
let headcount=$linecount-3
@@
-107,9
+109,6
@@
for systemvserver in reference-vservers/*.lst ; do
awk ' { print $1 } ' ${vdir}.changes.2 > ${vdir}.changes
rm -f ${vdir}.changes.*
awk ' { print $1 } ' ${vdir}.changes.2 > ${vdir}.changes
rm -f ${vdir}.changes.*
- # step 2: clean out yum cache to reduce space requirements
- yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y clean all
-
# step 3: create the ${vdir} with just the list given in ${vdir}.changes
install -d -m 755 ${vdir}-tmp/
rm -rf ${vdir}-tmp/*
# step 3: create the ${vdir} with just the list given in ${vdir}.changes
install -d -m 755 ${vdir}-tmp/
rm -rf ${vdir}-tmp/*