From: Martin Winter Date: Mon, 22 May 2017 11:04:35 +0000 (-0700) Subject: redhat: fix previous merge. initsystem detection should now work for mock builds... X-Git-Tag: reindent-master-before~92^2~2^2~2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=fe881ec5a19f2d8b8d3582a76a7237ed1a8fe928;p=mirror%2Ffrr.git redhat: fix previous merge. initsystem detection should now work for mock builds and native builds on systemd based systems Signed-off-by: Martin Winter --- diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 3f39f007e6..133ed1fcd0 100644 --- 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 [[ `file /sbin/init` =~ "symbolic link to \`../lib/systemd/systemd'" ]]; 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; elif [[ `systemctl` =~ -\.mount ]]; then echo systemd; fi)} # # If init system is systemd, then always disable watchfrr # @@ -539,7 +539,7 @@ rm -rf %{buildroot} %endif %changelog -* Thu Apr 17 2017 Martin Winter - %{version} +* Mon Apr 17 2017 Martin Winter - %{version} - new subpackage frr-pythontools with python 2.7 restart script - remove PIMd from CentOS/RedHat 6 RPM packages (won't work - too old) - converted to single frr init script (not per daemon) based on debian init script