disable systemd: disable also tmpfiles presence

[packages/rpm-build-macros.git] / disable-systemd.patch

diff --git a/disable-systemd.patch b/disable-systemd.patch
index 0dec30c7643ab5c0c222d90f3bd58f3f9eab049e..1dadbca292d071fff667a14fa6df6e8b54961ceb 100644 (file)
--- a/disable-systemd.patch
+++ b/disable-systemd.patch
@@ -1,7 +1,16 @@
---- rpm-build-macros-1.647/rpm.macros~ 2012-03-13 18:09:42.876512532 +0200
-+++ rpm-build-macros-1.647/rpm.macros  2012-03-13 18:10:01.389010815 +0200
-@@ -2166,79 +2166,17 @@
- # BuildRequires:      rpmbuild(macros) >= 1.647
+--- rpm-build-macros-1.680/rpm.macros~ 2013-11-27 01:15:12.122464636 +0200
++++ rpm-build-macros-1.680/rpm.macros  2013-11-27 01:16:06.644922965 +0200
+@@ -716,7 +716,7 @@
+ # tmpfiles.d configuration. Warn and terminate build if config is
+ # missing.
+ #
+-#%no_install_post_check_tmpfiles 1
++%no_install_post_check_tmpfiles 1
+ #
+ %__spec_install_post_check_tmpfiles { \
+ __spec_install_post_check_tmpfiles() { \
+@@ -2258,79 +2258,17 @@
+ # BuildRequires:      rpmbuild(macros) >= 1.671
  # Requires:   systemd-units >= 38
  
 -%systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
@@ -46,7 +55,7 @@
 -want_enable_service() { \
 -      [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
 -      [ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && return 1 \
--      /sbin/chkconfig --list ${1%.service} 2>/dev/null | grep -qsv "[0-6]:on" && return 1 \
+-      [ "$(echo /etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service})" = "/etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service}" ] && return 1 \
 -      return 0 \
 -}\
 -      export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
@@ -91,3 +100,43 @@
  
  %systemdunitdir /lib/systemd/system
  %systemdtmpfilesdir /usr/lib/tmpfiles.d
+--- ./service_generator.sh     1 Feb 2012 17:46:43 -0000       1.13
++++ ./service_generator.sh     4 Jan 2012 05:09:03 -0000       1.11
+@@ -19,8 +19,7 @@
+ # common part
+ service_body() {
+       cat <<-EOF
+-              if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
+-                      if [ -f /var/lock/subsys/$service ]; then
++              if [ -f /var/lock/subsys/$service ]; then
+       EOF
+       if [ "$noop" = 1 ]; then
+               echo :
+@@ -32,12 +31,11 @@
+ 
+       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
+ }
+@@ -61,10 +59,8 @@
+       echo 'else'
+               # service restart was disabled, tell them to restart it
+       cat <<-EOF
+-              if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
+-                      if [ -f /var/lock/subsys/$service ]; then
+-                              echo 'Run "/sbin/service $service restart" to restart $desc.'
+-                      fi
++              if [ -f /var/lock/subsys/$service ]; then
++                      echo 'Run "/sbin/service $service restart" to restart $desc.'
+               fi
+       EOF
+       echo 'fi'