1 --- rpm-build-macros-1.647/rpm.macros~ 2012-03-13 18:09:42.876512532 +0200
2 +++ rpm-build-macros-1.647/rpm.macros 2012-03-13 18:10:01.389010815 +0200
3 @@ -2166,79 +2166,17 @@
4 # BuildRequires: rpmbuild(macros) >= 1.647
5 # Requires: systemd-units >= 38
7 -%systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
9 -%systemd_service_enable() \
10 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
11 - /bin/systemctl --quiet enable %{*} || : \
12 - /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \
15 -%systemd_service_disable() \
16 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
17 - /bin/systemctl --quiet disable %{*} || : \
21 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
22 - /bin/systemd_booted && /bin/systemctl --quiet %{*} || : \
25 -%systemd_service_start() \
26 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
27 - /bin/systemd_booted && /bin/systemctl --quiet start %{*} || : \
30 -%systemd_service_stop() \
31 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
32 - /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
35 -%systemd_service_restart() \
36 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
37 - /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
40 -%systemd_service_reload() \
41 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
42 - /bin/systemd_booted && /bin/systemctl --quiet reload %{*} || : \
46 -want_enable_service() { \
47 - [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
48 - [ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && return 1 \
49 - /sbin/chkconfig --list ${1%.service} 2>/dev/null | grep -qsv "[0-6]:on" && return 1 \
52 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
54 - if want_enable_service $s; then \
55 - /bin/systemctl --quiet enable $s || : \
61 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
62 - /bin/systemd_booted && /bin/systemctl --quiet daemon-reload || : \
63 - if [ $1 -eq 1 ]; then \
64 - /bin/systemctl --quiet enable %{*} || : \
65 - /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \
66 - elif [ -z "$NORESTART" ]; then \
67 - /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
69 - /bin/systemd_booted && echo 'Run "/bin/systemctl restart %{*}" to restart %{*}.' || : \
74 - if [ $1 -eq 0 ]; then \
75 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
76 - /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
77 - /bin/systemctl --quiet disable %{*} || : \
80 +%systemd_reload %{nil}
81 +%systemd_service_enable() %{nil}
82 +%systemd_service_disable() %{nil}
83 +%systemd_service() %{nil}
84 +%systemd_service_start() %{nil}
85 +%systemd_service_stop() %{nil}
86 +%systemd_service_restart() %{nil}
87 +%systemd_service_reload() %{nil}
88 +%systemd_trigger() %{nil}
89 +%systemd_post() %{nil}
90 +%systemd_preun() %{nil}
92 %systemdunitdir /lib/systemd/system
93 %systemdtmpfilesdir /usr/lib/tmpfiles.d
94 --- ./service_generator.sh 1 Feb 2012 17:46:43 -0000 1.13
95 +++ ./service_generator.sh 4 Jan 2012 05:09:03 -0000 1.11
100 - if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
101 - if [ -f /var/lock/subsys/$service ]; then
102 + if [ -f /var/lock/subsys/$service ]; then
104 if [ "$noop" = 1 ]; then
108 if [ "$quiet" != 1 ]; then
111 - echo 'Run "/sbin/service $service start" to start $desc.'
113 + echo 'Run "/sbin/service $service start" to start $desc.'
123 # service restart was disabled, tell them to restart it
125 - if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
126 - if [ -f /var/lock/subsys/$service ]; then
127 - echo 'Run "/sbin/service $service restart" to restart $desc.'
129 + if [ -f /var/lock/subsys/$service ]; then
130 + echo 'Run "/sbin/service $service restart" to restart $desc.'