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

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

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index c8f9ded..c86ce7e 100644 (file)
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -54,6 +54,9 @@ linuxconf.
 
 
 %build
+aclocal -I m4
+autoconf
+automake
 # bootstrap to avoid BuildRequires of kernel-source
 for linux in $RPM_BUILD_DIR/linux-* /lib/modules/`uname -r`/build ; do
    [[ -d $linux/include ]] && %configure --with-kerneldir=$linux --enable-linuxconf && break
@@ -81,8 +84,8 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 # 1 = install, 2 = upgrade/reinstall
 if [ $1 -eq 2 ] ; then
-    for i in %v_services ; do
-       service $i stop
+    for i in %{services} ; do
+       [ "`/sbin/runlevel`" = "unknown" ] || service $i stop || :
     done
 fi
 
@@ -90,13 +93,13 @@ fi
 %post
 # 1 = install, 2 = upgrade/reinstall
 if [ $1 -eq 1 ] ; then
-    for i in %services ; do
+    for i in %{services} ; do
        chkconfig --add $i
        chkconfig $i on
     done
 fi
-for i in %services ; do
-    service $i start
+for i in %{services} ; do
+    [ "`/sbin/runlevel`" = "unknown" ] || service $i start
 done
 
 %__chattr +t /vservers || :
@@ -105,8 +108,8 @@ done
 %preun
 # 0 = erase, 1 = upgrade
 if [ $1 -eq 0 ] ; then
-    for i in %services ; do
-       service $i stop
+    for i in %{services} ; do
+       [ "`/sbin/runlevel`" = "unknown" ] || service $i stop || :
        chkconfig $i off
        chkconfig --del $i
     done