%define name @PACKAGE@
%define version @VERSION@
-%define release 6.planetlab%{?date:.%{date}}
+%define release 9.planetlab%{?date:.%{date}}
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
Distribution: PlanetLab 3.0
URL: http://cvs.planet-lab.org/cvs/util-vserver
-%define __chattr /usr/bin/chattr
-
Summary: Linux virtual server utilities
Name: %{name}
Version: %{version}
Conflicts: vserver < %epoch:%version-%release
Conflicts: vserver > %epoch:%version-%release
BuildRequires: e2fsprogs-devel
-Requires(post): %__chattr
%package linuxconf
Summary: Linuxconf administration modules for vservers
%clean
rm -rf $RPM_BUILD_ROOT
-%pre
-# 1 = install, 2 = upgrade/reinstall
-if [ $1 -eq 2 ] ; then
- # vcached no longer runs as a daemon
- [ "`/sbin/runlevel`" = "unknown" ] || service vcached stop || :
-fi
-
%post
-# vcached no longer runs as a daemon
-chkconfig vcached off
-chkconfig --del vcached
+chkconfig --add vservers
+chkconfig vservers on
+
if [ ! -f /etc/shells ] || ! grep -q '^/bin/vsh$' /etc/shells ; then
echo /bin/vsh >> /etc/shells
fi
-# make sure immutable bit is set on /vservers for safety
-%__chattr +t /vservers || :
+
+# make sure barrier bit is set on /vservers to prevent chroot() escapes
+%_libdir/%name/setattr --barrier /vservers
%postun
# 0 = erase, 1 = upgrade
%preun
# 0 = erase, 1 = upgrade
if [ $1 -eq 0 ] ; then
- [ "`/sbin/runlevel`" = "unknown" ] || service vservers stop
+ [ "$PL_BOOTCD" = "1" ] || service vservers stop
chkconfig vservers off
chkconfig --del vservers
fi