git://git.onelab.eu
/
sliceimage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- move vserver-reference to .vref/default
[sliceimage.git]
/
vserver-reference.spec
diff --git
a/vserver-reference.spec
b/vserver-reference.spec
index
477667c
..
0839f95
100644
(file)
--- a/
vserver-reference.spec
+++ b/
vserver-reference.spec
@@
-1,5
+1,5
@@
%define name vserver
%define name vserver
-%define version
3.1
+%define version
4.0
%define release 3%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Vendor: PlanetLab
%define release 3%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Vendor: PlanetLab
@@
-15,7
+15,8
@@
Source0: %{name}-%{version}.tar.bz2
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Requires: util-vserver, e2fsprogs, yum, coreutils
+Requires: util-vserver, e2fsprogs, yum
+Requires(pre): coreutils
%define debug_package %{nil}
%define debug_package %{nil}
@@
-46,10
+47,7
@@
This package installs the RPMS necessary to create system ("root
%build
pushd vserver-reference
%build
pushd vserver-reference
-./build.sh -r 2
-# Not until we can get the build server to run Fedora Core 4 or an
-# updated version of yum.
-#./build.sh -r 4
+./build.sh
./system-packages.sh
popd
./system-packages.sh
popd
@@
-58,6
+56,7
@@
rm -rf $RPM_BUILD_ROOT
pushd vserver-reference
install -D -m 755 vserver-reference.init $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference
pushd vserver-reference
install -D -m 755 vserver-reference.init $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference
+install -D -m 644 vserver-reference.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference
find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
popd
find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
popd
@@
-78,7
+77,8
@@
fi
%files reference
%defattr(-,root,root)
%{_initrddir}/vserver-reference
%files reference
%defattr(-,root,root)
%{_initrddir}/vserver-reference
-/vservers/vserver-reference
+%{_sysconfdir}/cron.d/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
@@
-110,6
+110,11
@@
chkconfig --add vserver-reference
chkconfig vserver-reference on
[ "$PL_BOOTCD" = "1" ] || service vserver-reference start
chkconfig vserver-reference on
[ "$PL_BOOTCD" = "1" ] || service vserver-reference start
+# Randomize daily run time
+M=$((60 * $RANDOM / 32768))
+H=$((24 * $RANDOM / 32768))
+sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
+
%changelog
* Tue Sep 1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
- Pre-package vserver-reference instead of building it on nodes
%changelog
* Tue Sep 1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
- Pre-package vserver-reference instead of building it on nodes