git://git.onelab.eu
/
util-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change chroot() escape fix to setting the barrier bit rather than the immulink bit...
[util-vserver.git]
/
util-vserver.spec.in
diff --git
a/util-vserver.spec.in
b/util-vserver.spec.in
index
77198bf
..
fcece17
100644
(file)
--- a/
util-vserver.spec.in
+++ b/
util-vserver.spec.in
@@
-7,8
+7,6
@@
Packager: PlanetLab Central <support@planet-lab.org>
Distribution: PlanetLab 3.0
URL: http://cvs.planet-lab.org/cvs/util-vserver
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}
Summary: Linux virtual server utilities
Name: %{name}
Version: %{version}
@@
-23,7
+21,6
@@
Provides: vserver = %epoch:%version-%release
Conflicts: vserver < %epoch:%version-%release
Conflicts: vserver > %epoch:%version-%release
BuildRequires: e2fsprogs-devel
Conflicts: vserver < %epoch:%version-%release
Conflicts: vserver > %epoch:%version-%release
BuildRequires: e2fsprogs-devel
-Requires(post): %__chattr
%package linuxconf
Summary: Linuxconf administration modules for vservers
%package linuxconf
Summary: Linuxconf administration modules for vservers
@@
-99,8
+96,8
@@
chkconfig --del vcached
if [ ! -f /etc/shells ] || ! grep -q '^/bin/vsh$' /etc/shells ; then
echo /bin/vsh >> /etc/shells
fi
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
%postun
# 0 = erase, 1 = upgrade