disabling the extras fedora repo when installing netflow - yum gets confused by ulogd...

[sliceimage.git] / build.sh

diff --git a/build.sh b/build.sh
index e777822..c7ba063 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
-vrefpackages=$(grep "^package:.*" vserver-reference.lst | awk '{print $2}')
-vrefgroups=$(grep "^group:.*" vserver-reference.lst | awk '{print $2}')
 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
 
@@ -68,35 +69,55 @@ pl_setup_chroot ${vref} ${options}
 for systemvserver in reference-vservers/*.lst ; do
     NAME=$(basename $systemvserver .lst)
 
+    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
-    # OPTIMIZATION: Consider using "cp -al" in the future
-    rsync -a ${vref}/ ${vdir}/
+    (cd ${vref} && find . | cpio -m -d -u -p ${vdir})
     rm -f ${vdir}/var/lib/rpm/__db*
 
     # Communicate to the initialization script from which vref this stub was cloned
     echo ${vrefname} > ${vdir}.cloned
 
-    # Construct the excludes & includes patterns for rsync
-    (cd ${vdir} && find *) > ${vdir}.excludes
-    echo "var/lib/rpm/*" > ${vdir}.includes
-
     # Install the system vserver specific packages
-    [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
+    # 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 "$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
-    mkdir -p ${vdir}-tmp/
-    rsync -a --include-from=${vdir}.includes --exclude-from=${vdir}.excludes ${vdir}/ ${vdir}-tmp/
+    # 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: 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
+    let tailcount=$headcount-1
+    # get rid of the last 3 lines of the rsync output
+    head -${headcount} ${vdir}.changes > ${vdir}.changes.1
+    # get rid of the first line of the rsync output
+    tail -${tailcount} ${vdir}.changes.1 > ${vdir}.changes.2
+    # post process rsync output to get rid of symbolic link embellish output
+    awk ' { print $1 } ' ${vdir}.changes.2 > ${vdir}.changes
+    rm -f ${vdir}.changes.*
+
+    # step 3: create the ${vdir} with just the list given in ${vdir}.changes 
+    install -d -m 755 ${vdir}-tmp/
+    rm -rf ${vdir}-tmp/*
+    (cd ${vdir} && cpio -m -d -u -p ${vdir}-tmp < ${vdir}.changes)
     rm -rf ${vdir}
-    rm -f ${vdir}.excludes ${vdir}.includes
+    rm -f  ${vdir}.changes
     mv ${vdir}-tmp ${vdir}
+    echo "--------DONE BUILDING system vserver ${NAME}: $(date)"
 done
 
 exit 0