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

redhat: use %initsystem check that works when chrooted
FRRouting · Apr 28, 2017 · bedc9ac · bedc9ac
2 parents f9e0332 + 20701ca
commit bedc9ac
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
@@ -49,7 +49,7 @@
 
 #### Check for systemd or init.d (upstart)
 # 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
 #