X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=service_generator.sh;h=dd52786c6bb06193edbbf1deecf70ec8b439c25f;hb=c1caefa55b37605474a82e264ac54aa134c5a734;hp=900ed65768e257b2755a0eed53b0a0c92efad37b;hpb=bb9cb04dcd5c3ef4e460bcf16e1c166446763efc;p=packages%2Frpm-build-macros.git

diff --git a/service_generator.sh b/service_generator.sh
index 900ed65..dd52786 100644
--- 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}
 	};