- 1.293: added %cmake macro

[packages/rpm-build-macros.git] / service_generator.sh

diff --git a/service_generator.sh b/service_generator.sh
index 900ed65768e257b2755a0eed53b0a0c92efad37b..dd52786c6bb06193edbbf1deecf70ec8b439c25f 100644 (file)
--- a/service_generator.sh
+++ b/service_generator.sh
@@ -19,12 +19,12 @@ fi
 service_body() {
        cat <<-EOF
        if [ -f /var/lock/subsys/$service ]; then
-               /etc/rc.d/init.d/$service $action 1>&2
+               /sbin/service $service $action 1>&2 || :;
 EOF
        if [ "$quiet" != 1 ]; then
                cat <<-EOF
                else
-                       echo 'Run "/etc/rc.d/init.d/$service start" to start $desc.'
+                       echo 'Run "/sbin/service $service start" to start $desc.'
 EOF
        fi
        cat <<-EOF
@@ -35,9 +35,8 @@ EOF
 # include check function
 skip_auto_restart_body() {
        cat <<-EOF
-
        skip_auto_restart() {
-               . /etc/sysconfig/rpm
+               [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm
                [ -f /etc/sysconfig/$service ] && . /etc/sysconfig/$service
                echo \${RPM_SKIP_AUTO_RESTART:-no}
        };