+#
+# $Id$
+#
+%define url $URL$
+
%define name vserver
-%define version 4.0
-%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 4.2
+%define taglevel 1
-Vendor: PlanetLab
-Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
-URL: http://cvs.planet-lab.org/cvs/vserver-reference
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Summary: VServer reference image
Name: %{name}
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Requires: util-vserver, e2fsprogs, yum
-Requires(pre): coreutils
+
+Vendor: PlanetLab
+Packager: PlanetLab Central <support@planet-lab.org>
+Distribution: PlanetLab %{plrelease}
+URL: %(echo %{url} | cut -d ' ' -f 2)
%define debug_package %{nil}
Summary: VServer reference image
Group: Applications/System
AutoReqProv: no
+Requires: util-vserver, e2fsprogs, yum
+Requires(pre): /bin/sh, coreutils
%description reference
This package creates the virtual server (VServer) reference image used
%package system-packages
Summary: System slice packages
Group: Applications/System
-Requires: vserver-reference = %{version}-%{release}
+Requires: vserver-reference >= %{version}-%{release}
AutoReqProv: no
%description system-packages
This package installs the RPMS necessary to create system ("root
- resource") slices from the virtual server (VServer) reference image.
+resource") slices from the virtual server (VServer) reference image.
%prep
%setup -q
%build
-pushd vserver-reference
-./build.sh -r 4
-./system-packages.sh
+pushd VserverReference
+./build.sh %{pldistro}
popd
%install
rm -rf $RPM_BUILD_ROOT
-pushd vserver-reference
+pushd VserverReference
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
+install -D -m 644 vserver-reference.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vserver-reference
find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
popd
# If run under sudo
if [ -n "$SUDO_USER" ] ; then
# Allow user to delete the build directory
- chown -R $SUDO_USER .
+ chown -h -R $SUDO_USER .
# Some temporary cdroot files like /var/empty/sshd and
# /usr/bin/sudo get created with non-readable permissions.
find . -not -perm +0600 -exec chmod u+rw {} \;
# Allow user to delete the built RPM(s)
- chown -R $SUDO_USER %{_rpmdir}/%{_arch}
+ chown -h -R $SUDO_USER %{_rpmdir}/%{_arch}
fi
%files reference
%defattr(-,root,root)
%{_initrddir}/vserver-reference
-/vservers/vserver-reference
+%{_sysconfdir}/cron.d/vserver-reference
+%{_sysconfdir}/logrotate.d/vserver-reference
+/vservers/.vref/default
%files system-packages
%defattr(-,root,root)
-/vservers/system-packages
+/vservers/.vstub
%define vcached_pid /var/run/vcached.pid
# 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
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
+* Thu Jan 31 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vserver-4.2-0 vserver-4.2-1
+- more careful scan of the vserver-*.pkgs image specifications
+
* Tue Sep 1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
- Pre-package vserver-reference instead of building it on nodes