Fixed version of vsh.c that no longer uses planetlab.c.

[util-vserver.git] / util-vserver.spec.in

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index 3a34e1f..80ec5a0 100644 (file)
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -79,13 +79,13 @@ test "%_initrddir" = %_sysconfdir/init.d || {
 rm -rf $RPM_BUILD_ROOT
 
 
-%define services vcached
+%define services vcached vservers
 
 %pre
 # 1 = install, 2 = upgrade/reinstall
 if [ $1 -eq 2 ] ; then
     for i in %{services} ; do
-       [ "`/sbin/runlevel`" = "unknown" ] || service $i stop
+       [ "`/sbin/runlevel`" = "unknown" ] || service $i stop || :
     done
 fi
 
@@ -109,7 +109,7 @@ done
 # 0 = erase, 1 = upgrade
 if [ $1 -eq 0 ] ; then
     for i in %{services} ; do
-       [ "`/sbin/runlevel`" = "unknown" ] || service $i stop
+       [ "`/sbin/runlevel`" = "unknown" ] || service $i stop || :
        chkconfig $i off
        chkconfig --del $i
     done
@@ -126,6 +126,8 @@ fi
 %_mandir/man8/*
 %config %_initrddir/*
 %config(noreplace) /etc/vservers.conf
+%config(noreplace) /etc/vcached.conf
+%dir /etc/vservers
 %attr(0,root,root) %dir /vservers
 
 %exclude %_sbindir/newvserver