cross-module change -- cleaning vcached, and vserver pre install script

diff --git a/build.sh b/build.sh
index c5cfcb7..28de383 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -40,16 +40,16 @@ shift $shiftcount
 # pldistro expected as $1 
 pldistro=$1 ; shift
 # The vserver reference name - this comes from spec's slicefamily
 # pldistro expected as $1 
 pldistro=$1 ; shift
 # The vserver reference name - this comes from spec's slicefamily

-vrefname=$1; shift
+slicefamily=$1; shift

 
 # Do not tolerate errors
 set -e
 
 # Path's to the vserver references images and stubs
 vrefdir=$PWD/vservers/.vref
 
 # Do not tolerate errors
 set -e
 
 # Path's to the vserver references images and stubs
 vrefdir=$PWD/vservers/.vref

-vref=${vrefdir}/${vrefname}
+vref=${vrefdir}/${slicefamily}

 # stubs are created in a subdir per slicefamily
 # stubs are created in a subdir per slicefamily

-vstubdir=$PWD/vservers/.vstub/${vrefname}
+vstubdir=$PWD/vservers/.vstub/${slicefamily}

 
 # Make /vservers and default vserver reference image
 install -d -m 755 ${vref}
 
 # Make /vservers and default vserver reference image
 install -d -m 755 ${vref}


@@ -85,7 +85,7 @@ systemvserver_count=$(ls ../build/config.${pldistro}/vserver-*.pkgs 2> /dev/null
     rm -f ${vdir}/var/lib/rpm/__db*
 
     # Communicate to the initialization script from which vref this stub was cloned
     rm -f ${vdir}/var/lib/rpm/__db*
 
     # Communicate to the initialization script from which vref this stub was cloned

-    echo ${vrefname} > ${vdir}.cloned
+    echo ${slicefamily} > ${vdir}.cloned

 
     # Install the system vserver specific packages
     [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
 
     # Install the system vserver specific packages
     [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 35f008d..86fc5f5 100644 (file)
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -37,7 +37,6 @@ Summary: VServer reference image
 Group: Applications/System
 AutoReqProv: no
 Requires: util-vserver, e2fsprogs, yum
 Group: Applications/System
 AutoReqProv: no
 Requires: util-vserver, e2fsprogs, yum

-Requires(pre): /bin/sh, coreutils

 
 %description %{slicefamily}
 This package creates the virtual server (VServer) reference image used
 
 %description %{slicefamily}
 This package creates the virtual server (VServer) reference image used


@@ -49,9 +48,9 @@ Group: Applications/System
 Requires: vserver-%{slicefamily} >= %{version}-%{release}
 AutoReqProv: no
 
 Requires: vserver-%{slicefamily} >= %{version}-%{release}
 AutoReqProv: no
 

-%description systemslices-%{slicefamily}
-This package installs the RPMS necessary to create system ("root
-resource") slices from the virtual server (VServer) reference image.
+%description systemslices-%{slicefamily} 
+This package installs the stubs necessary to create system slices
+(typically planetflow) on top of the reference image.

 
 %prep
 %setup -q
 
 %prep
 %setup -q


@@ -94,28 +93,15 @@ fi
 
 %files systemslices-%{slicefamily}
 %defattr(-,root,root)
 
 %files systemslices-%{slicefamily}
 %defattr(-,root,root)

-/vservers/.vstub
+/vservers/.vstub/%{slicefamily}

 
 %define vcached_pid /var/run/vcached.pid
 
 %pre %{slicefamily}
 
 %define vcached_pid /var/run/vcached.pid
 
 %pre %{slicefamily}

-# Stop vcached
-if [ -r %{vcached_pid} ] ; then
-    kill $(cat %{vcached_pid})
-fi
-echo $$ > %{vcached_pid}
-
-# vcached will clean up .vtmp later
-mkdir -p /vservers/.vtmp
-if [ -d /vservers/.vref ] ; then
-    mv /vservers/.vref /vservers/.vtmp/.vref.$RANDOM
-fi
-if [ -d /vservers/.vcache ] ; then
-    mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM
-fi
+rm -rf /vservers/.vref/%{slicefamily}

 
 

-# Allow vcached to run again
-rm -f %{vcached_pid}
+%pre systemslices-%{slicefamily}
+rm -rf /vservers/.vstub/%{slicefamily}

 
 %post %{slicefamily}
 chkconfig --add vserver-reference
 
 %post %{slicefamily}
 chkconfig --add vserver-reference