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
Fix so that vsh works from /bin/vsh again.
[util-vserver.git]
/
util-vserver.spec.in
diff --git
a/util-vserver.spec.in
b/util-vserver.spec.in
index
563103a
..
6ba68e8
100644
(file)
--- a/
util-vserver.spec.in
+++ b/
util-vserver.spec.in
@@
-97,9
+97,10
@@
fi
for i in %{services} ; do
[ "`/sbin/runlevel`" = "unknown" ] || service $i start
done
for i in %{services} ; do
[ "`/sbin/runlevel`" = "unknown" ] || service $i start
done
-if [ ! -f /etc/shells ] || ! grep -q '^/
usr/s
bin/vsh$' /etc/shells ; then
- echo /
usr/s
bin/vsh >> /etc/shells
+if [ ! -f /etc/shells ] || ! grep -q '^/bin/vsh$' /etc/shells ; then
+ echo /bin/vsh >> /etc/shells
fi
fi
+ln -f /usr/sbin/vsh /bin/vsh
%__chattr +t /vservers || :
%__chattr +t /vservers || :
@@
-107,8
+108,9
@@
fi
%postun
# 0 = erase, 1 = upgrade
if [ "$1" = 0 ] ; then
%postun
# 0 = erase, 1 = upgrade
if [ "$1" = 0 ] ; then
- perl -i -n -e 'next if /^\/
usr\/s
bin\/vsh$/; print' /etc/shells
+ perl -i -n -e 'next if /^\/bin\/vsh$/; print' /etc/shells
fi
fi
+rm -f /usr/sbin/vsh /bin/vsh
%preun
# 0 = erase, 1 = upgrade
%preun
# 0 = erase, 1 = upgrade
@@
-134,6
+136,7
@@
fi
%dir /etc/vservers
%attr(0,root,root) %dir /vservers
%attr(4755,root,root) /usr/sbin/vsh
%dir /etc/vservers
%attr(0,root,root) %dir /vservers
%attr(4755,root,root) /usr/sbin/vsh
+%attr(4755,root,root) /bin/vsh
%exclude %_sbindir/newvserver
%exclude %_mandir/man8/newvserver*
%exclude %_sbindir/newvserver
%exclude %_mandir/man8/newvserver*