disable-systemd.patch

   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
   6
   7 -%systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
   8 -
   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 %{*}.' || : \
  13 -%{nil}
  14 -
  15 -%systemd_service_disable() \
  16 -       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
  17 -       /bin/systemctl --quiet disable %{*} || : \
  18 -%{nil}
  19 -
  20 -%systemd_service() \
  21 -       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
  22 -       /bin/systemd_booted && /bin/systemctl --quiet %{*} || : \
  23 -%{nil}
  24 -
  25 -%systemd_service_start() \
  26 -       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
  27 -       /bin/systemd_booted && /bin/systemctl --quiet start %{*} || : \
  28 -%{nil}
  29 -
  30 -%systemd_service_stop() \
  31 -       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
  32 -       /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
  33 -%{nil}
  34 -
  35 -%systemd_service_restart() \
  36 -       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
  37 -       /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
  38 -%{nil}
  39 -
  40 -%systemd_service_reload() \
  41 -       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
  42 -       /bin/systemd_booted && /bin/systemctl --quiet reload %{*} || : \
  43 -%{nil}
  44 -
  45 -%systemd_trigger() \
  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 \
  50 -       return 0 \
  51 -}\
  52 -       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
  53 -       for s in %{*}; do \
  54 -               if want_enable_service $s; then \
  55 -                       /bin/systemctl --quiet enable $s || : \
  56 -               fi \
  57 -       done \
  58 -%{nil}
  59 -
  60 -%systemd_post() \
  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 %{*} || : \
  68 -       else \
  69 -               /bin/systemd_booted && echo 'Run "/bin/systemctl restart %{*}" to restart %{*}.' || : \
  70 -       fi \
  71 -%{nil}
  72 -
  73 -%systemd_preun() \
  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 %{*} || : \
  78 -       fi \
  79 -%{nil}
  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}
  91
  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
  96 @@ -19,8 +19,7 @@
  97  # common part
  98  service_body() {
  99         cat <<-EOF
 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
 103         EOF
 104         if [ "$noop" = 1 ]; then
 105                 echo :
 106 @@ -32,12 +31,11 @@
 107
 108         if [ "$quiet" != 1 ]; then
 109                 cat <<-EOF
 110 -                       else
 111 -                               echo 'Run "/sbin/service $service start" to start $desc.'
 112 +               else
 113 +                       echo 'Run "/sbin/service $service start" to start $desc.'
 114                 EOF
 115         fi
 116         cat <<-EOF
 117 -                       fi
 118                 fi
 119         EOF
 120  }
 121 @@ -61,10 +59,8 @@
 122         echo 'else'
 123                 # service restart was disabled, tell them to restart it
 124         cat <<-EOF
 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.'
 128 -                       fi
 129 +               if [ -f /var/lock/subsys/$service ]; then
 130 +                       echo 'Run "/sbin/service $service restart" to restart $desc.'
 131                 fi
 132         EOF
 133         echo 'fi'