Merge pull request #2 from silasm/rpm-fixes-2.0

redhat: use %initsystem check that works when chrooted
This commit is contained in:
Martin Winter 2017-04-28 14:03:40 -07:00 committed by GitHub
commit bedc9ac10f

View File

@ -49,7 +49,7 @@
#### Check for systemd or init.d (upstart) #### Check for systemd or init.d (upstart)
# Check for init.d (upstart) as used in CentOS 6 or systemd (ie CentOS 7) # Check for init.d (upstart) as used in CentOS 6 or systemd (ie CentOS 7)
%{expand: %%global initsystem %(if [[ `/sbin/init --version 2> /dev/null` =~ upstart ]]; then echo upstart; elif [[ `systemctl` =~ -\.mount ]]; then echo systemd; fi)} %{expand: %%global initsystem %(if [[ `/sbin/init --version 2> /dev/null` =~ upstart ]]; then echo upstart; elif [[ `file /sbin/init` =~ "symbolic link to \`../lib/systemd/systemd'" ]]; then echo systemd; fi)}
# #
# If init system is systemd, then always disable watchfrr # If init system is systemd, then always disable watchfrr
# #