- don't count a bad service stop as a failure

diff --git a/util-vserver.spec b/util-vserver.spec
index d1b9c37..fa9eec1 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 # 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

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index 3a34e1f..c86ce7e 100644 (file)
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 # 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