- move vserver-reference to .vref/default

diff --git a/build.sh b/build.sh
index af9c589..fa420c0 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -84,10 +84,10 @@ done
 set -e
 
 # Make /vservers
 set -e
 
 # Make /vservers

-vroot=$PWD/vservers/vserver-reference
+vroot=$PWD/vservers/.vref/default

 install -d -m 755 $vroot
 
 install -d -m 755 $vroot
 

-# Install vserver-reference system
+# Install default reference image

 for package in "${packagelist[@]}" ; do
     packages="$packages -p $package"
 done
 for package in "${packagelist[@]}" ; do
     packages="$packages -p $package"
 done

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 1616904..0839f95 100644 (file)
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,6 +1,6 @@
 %define name vserver
 %define version 4.0
 %define name vserver
 %define version 4.0

-%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release 3%{?pldistro:.%{pldistro}}%{?date:.%{date}}

 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>


@@ -78,7 +78,7 @@ fi
 %defattr(-,root,root)
 %{_initrddir}/vserver-reference
 %{_sysconfdir}/cron.d/vserver-reference
 %defattr(-,root,root)
 %{_initrddir}/vserver-reference
 %{_sysconfdir}/cron.d/vserver-reference

-/vservers/vserver-reference
+/vservers/.vref/default

 
 %files system-packages
 %defattr(-,root,root)
 
 %files system-packages
 %defattr(-,root,root)


@@ -95,8 +95,8 @@ echo $$ > %{vcached_pid}
 
 # vcached will clean up .vtmp later
 mkdir -p /vservers/.vtmp
 
 # vcached will clean up .vtmp later
 mkdir -p /vservers/.vtmp

-if [ -d /vservers/vserver-reference ] ; then
-    mv /vservers/vserver-reference /vservers/.vtmp/vserver-reference.$RANDOM
+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
 if [ -d /vservers/.vcache ] ; then
     mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM