From 20701ca33a643179f8d86c2f3bb06403e17c0602 Mon Sep 17 00:00:00 2001 From: smccroskey Date: Thu, 27 Apr 2017 19:39:24 -0700 Subject: [PATCH] redhat: use %initsystem check that works when chrooted `systemctl' returns different, non-useful output while in a chroot. Switch to checking if /sbin/init is a symlink to the systemd binary. With this change the build works in a mock chroot. Signed-off-by: Silas McCroskey --- redhat/frr.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index d1684672f7e3..3f39f007e621 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 [[ `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 #