- partial support for systemd in %service

Changed files:
    rpm-build-macros.spec -> 1.318
    rpm.macros -> 1.639
    service_generator.sh -> 1.12

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 2a1c39a04fd390e54b3c9219d2d81ea9caba2f5d..b6ba5194f5eb9ff519ed196bbf1b5651cc8a3876 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.638
+%define                rpm_macros_rev  1.639
 %define                find_lang_rev   1.35
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/service_generator.sh b/service_generator.sh
index 19406f1122b33442510ff04746f82519254096f0..e3acebb17af415763561613fc7521a3877e127da 100644 (file)
--- a/service_generator.sh
+++ b/service_generator.sh
@@ -19,7 +19,8 @@ fi
 # common part
 service_body() {
        cat <<-EOF
-               if [ -f /var/lock/subsys/$service ]; then
+               if ! /bin/systemd_booted; then
+                       if [ -f /var/lock/subsys/$service ]; then
        EOF
        if [ "$noop" = 1 ]; then
                echo :
@@ -31,11 +32,12 @@ service_body() {
 
        if [ "$quiet" != 1 ]; then
                cat <<-EOF
-               else
-                       echo 'Run "/sbin/service $service start" to start $desc.'
+                       else
+                               echo 'Run "/sbin/service $service start" to start $desc.'
                EOF
        fi
        cat <<-EOF
+                       fi
                fi
        EOF
 }
@@ -59,8 +61,10 @@ if [ "$check" = 1 ]; then
        echo 'else'
                # service restart was disabled, tell them to restart it
        cat <<-EOF
-               if [ -f /var/lock/subsys/$service ]; then
-                       echo 'Run "/sbin/service $service restart" to restart $desc.'
+               if ! /bin/systemd_booted; then
+                       if [ -f /var/lock/subsys/$service ]; then
+                               echo 'Run "/sbin/service $service restart" to restart $desc.'
+                       fi
                fi
        EOF
        echo 'fi'