git://git.onelab.eu
/
vserver-reference.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
098f2cc
)
use the default /etc/yum.conf that comes with the yum package
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Mon, 25 Feb 2008 19:45:57 +0000
(19:45 +0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Mon, 25 Feb 2008 19:45:57 +0000
(19:45 +0000)
build.sh
patch
|
blob
|
history
diff --git
a/build.sh
b/build.sh
index
28e23c3
..
4f9b8e3
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-92,10
+92,10
@@
systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null
[ -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
[ -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
-
pkgsdir=$(dirname $pkgsfile)
-
pkgsname=$(basename $pkgsfile .pkgs)
-
postfile="${pkgsdir}/${pkgsname}.post"
-
[ -f $postfile ] && /bin/bash $postfile ${vdir} || :
+ pkgsdir=$(dirname $pkgsfile)
+ pkgsname=$(basename $pkgsfile .pkgs)
+ postfile="${pkgsdir}/${pkgsname}.post"
+ [ -f $postfile ] && /bin/bash $postfile ${vdir} || :
# 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:
@@
-103,6
+103,8
@@
systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null
# step 1: clean out yum cache to reduce space requirements
yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y clean all
# step 1: clean out yum cache to reduce space requirements
yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y clean all
+ [ -f ${vdir}/etc/yum.conf.rpmnew ] && mv ${vdir}/etc/yum.conf.rpmnew ${vdir}/etc/yum.conf
+
# 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 } ')
# 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 } ')
@@
-126,4
+128,7
@@
systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null
echo "--------DONE BUILDING system vserver ${NAME}: $(date)"
done
echo "--------DONE BUILDING system vserver ${NAME}: $(date)"
done
+# switch the vserver reference /etc/yum.conf to the new one from the yum package
+[ -f ${vref}/etc/yum.conf.rpmnew ] && mv ${vref}/etc/yum.conf.rpmnew ${vref}/etc/yum.conf
+
exit 0
exit 0