-%define name vserver-reference
-%define version 3.1
-%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define name vserver
+%define version 4.0
+%define release 1%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Requires: util-vserver, e2fsprogs, yum
+Requires: util-vserver, e2fsprogs, yum, coreutils
-AutoReqProv: no
%define debug_package %{nil}
%description
+This package does not really exist.
+
+%package reference
+Summary: VServer reference image
+Group: Applications/System
+AutoReqProv: no
+
+%description reference
This package creates the virtual server (VServer) reference image used
as the installation base for new PlanetLab slivers.
+%package system-packages
+Summary: System slice packages
+Group: Applications/System
+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.
+
%prep
%setup -q
%build
-RPM_BUILD_DIR=$RPM_BUILD_DIR ./build.sh
+pushd vserver-reference
+./build.sh -r 4
+./system-packages.sh
+popd
%install
rm -rf $RPM_BUILD_ROOT
-install -D -m 755 %{name}.init $RPM_BUILD_ROOT/%{_initrddir}/%{name}
-find vservers/vserver-reference | cpio -p -d -u $RPM_BUILD_ROOT/
-# If run under sudo, allow user to delete the build directory
-if [ -n "$SUDO_USER" ] ; then
- chown -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 {} \;
-fi
+pushd vserver-reference
+install -D -m 755 vserver-reference.init $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference
+find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
+popd
%clean
rm -rf $RPM_BUILD_ROOT
-# If run under sudo, allow user to delete the built RPM
+# If run under sudo
if [ -n "$SUDO_USER" ] ; then
- chown $SUDO_USER %{_rpmdir}/%{_arch}/%{name}-%{version}-%{release}.%{_arch}.rpm
+ # Allow user to delete the build directory
+ chown -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}
fi
-%files
+%files reference
%defattr(-,root,root)
-%{_initrddir}/%{name}
+%{_initrddir}/vserver-reference
/vservers/vserver-reference
+%files system-packages
+%defattr(-,root,root)
+/vservers/system-packages
+
%define vcached_pid /var/run/vcached.pid
-%pre
+%pre reference
# Stop vcached
if [ -r %{vcached_pid} ] ; then
kill $(cat %{vcached_pid})
# Allow vcached to run again
rm -f %{vcached_pid}
-%post
-chkconfig --add %{name}
-chkconfig %{name} on
+%post reference
+chkconfig --add vserver-reference
+chkconfig vserver-reference on
[ "$PL_BOOTCD" = "1" ] || service vserver-reference start
%changelog