define separate package vserver-sliceimage with just the utiliy/init script for vserver

diff --git a/cron.d/sliceimage b/cron.d/vserver-sliceimage
similarity index 73%
rename from cron.d/sliceimage
rename to cron.d/vserver-sliceimage
index ce64278..7c3ab35 100644 (file)
--- a/cron.d/sliceimage
+++ b/cron.d/vserver-sliceimage
@@ -6,4 +6,4 @@
 # Copyright (C) 2006 The Trustees of Princeton University
 #
 
-@M@ @H@ * * *  root    /etc/init.d/sliceimage start >/dev/null 2>&1
+@M@ @H@ * * *  root    /etc/init.d/vserver-sliceimage start >/dev/null 2>&1

diff --git a/initscripts/sliceimage b/initscripts/vserver-sliceimage
similarity index 99%
rename from initscripts/sliceimage
rename to initscripts/vserver-sliceimage
index 8fee05c..09ac2c7 100755 (executable)
--- a/initscripts/sliceimage
+++ b/initscripts/vserver-sliceimage
@@ -37,7 +37,7 @@ exec 3>&1
 exec 4>&2
 
 # Redirect stdout and stderr to a log file
-exec >>/var/log/sliceimage
+exec >>/var/log/vserver-sliceimage
 exec 2>&1
 
 echo "--- STARTING $(date) ---"  >&3 2>&4

diff --git a/logrotate/sliceimage b/logrotate/vserver-sliceimage
similarity index 73%
rename from logrotate/sliceimage
rename to logrotate/vserver-sliceimage
index 5490816..82bc38b 100644 (file)
--- a/logrotate/sliceimage
+++ b/logrotate/vserver-sliceimage
@@ -1,4 +1,4 @@
-/var/log/sliceimage {
+/var/log/vserver-sliceimage {
     copytruncate
     compress
     daily

diff --git a/sliceimage.spec b/sliceimage.spec
index 53ef747..87c536a 100644 (file)
--- a/sliceimage.spec
+++ b/sliceimage.spec
@@ -41,7 +41,6 @@ This package does not really exist.
 Summary: Slice reference image for creating slivers
 Group: Applications/System
 AutoReqProv: no
-Requires: util-vserver, e2fsprogs, yum
 # in 5.0, this package was named vserver-<>
 Obsoletes: vserver-%{slicefamily}
 
@@ -74,9 +73,6 @@ popd
 rm -rf $RPM_BUILD_ROOT
 
 pushd sliceimage
-install -D -m 755 initscripts/sliceimage $RPM_BUILD_ROOT/%{_initrddir}/sliceimage
-install -D -m 644 cron.d/sliceimage $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/sliceimage
-install -D -m 644 logrotate/sliceimage $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/sliceimage
 # the path for the root of these is still /vservers/ for compat
 find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
 popd
@@ -86,31 +82,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files %{slicefamily}
 %defattr(-,root,root)
-%{_initrddir}/sliceimage
-%{_sysconfdir}/cron.d/sliceimage
-%{_sysconfdir}/logrotate.d/sliceimage
 /vservers/.vref/%{slicefamily}
 
 %files system-%{slicefamily}
 %defattr(-,root,root)
 /vservers/.vstub/%{slicefamily}
 
-%define vcached_pid /var/run/vcached.pid
-
-%post %{slicefamily}
-chkconfig --add sliceimage
-chkconfig sliceimage on
-[ "$PL_BOOTCD" = "1" ] || service sliceimage 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/sliceimage
-
-%post system-%{slicefamily}
-# need to do this for system slices, for when a new image shows up
-# we've already the service installed and enabled, as systemslices requires the plain package
-[ "$PL_BOOTCD" = "1" ] || service sliceimage force
+#%define vcached_pid /var/run/vcached.pid
 
 %changelog
 * Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vserver-reference-5.0-6

diff --git a/vserver-sliceimage.spec b/vserver-sliceimage.spec
new file mode 100644 (file)
index 0000000..522123a
--- /dev/null
+++ b/vserver-sliceimage.spec
@@ -0,0 +1,62 @@
+%define name vserver-sliceimage
+%define version 5.1
+%define taglevel 0
+
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+
+Vendor: PlanetLab
+Packager: PlanetLab Central <support@planet-lab.org>
+Distribution: PlanetLab %{plrelease}
+URL: %{SCMURL}
+
+Summary: vserver-specific node code for slice families
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Source0: %{name}-%{version}.tar.bz2
+License: GPL
+Group: Applications/System
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Requires: util-vserver, e2fsprogs, yum
+BuildArch: noarch
+
+%description
+vserver-specific initscript for handling slice images
+initializes vrefs from stubs for system slices
+handles cow flags, and various cleanups
+
+%prep
+%setup -q
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+install -D -m 755 initscripts/sliceimage $RPM_BUILD_ROOT/%{_initrddir}/sliceimage
+install -D -m 644 cron.d/sliceimage $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/sliceimage
+install -D -m 644 logrotate/sliceimage $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/sliceimage
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%{_initrddir}/sliceimage
+%{_sysconfdir}/cron.d/sliceimage
+%{_sysconfdir}/logrotate.d/sliceimage
+
+%post
+chkconfig --add sliceimage
+chkconfig sliceimage on
+[ "$PL_BOOTCD" = "1" ] || service sliceimage 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/sliceimage
+
+%post
+# need to do this for system slices, for when a new image shows up
+# we've already the service installed and enabled, as systemslices requires the plain package
+[ "$PL_BOOTCD" = "1" ] || service sliceimage force
+