summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2013-02-22 12:07:19 +0200
committerAlexander Bokovoy <ab@samba.org>2013-02-22 18:18:20 +0100
commit36da56ec51ecf03458fd85741ae248b49cf0d592 (patch)
treeaf5d686e4ad438cc270a257fdfdc6fb6fc7388ec
parent92b087182c047cd457bbe04d6306c50451698d61 (diff)
downloadsamba-36da56ec51ecf03458fd85741ae248b49cf0d592.tar.gz
samba-36da56ec51ecf03458fd85741ae248b49cf0d592.tar.bz2
samba-36da56ec51ecf03458fd85741ae248b49cf0d592.zip
Make systemctl reference indirect in packaging/NetworkManager/30-winbind-systemd
Some distributions have clever dependency generators when building packages and generate dependencies for each executable called out in shell scripts. The end result is that a package built out of samba would contain explicit dependency to systemd even though it is usable without systemd. Making systemctl reference indirect avoids explicit dependency. Reviewed-by: Andreas Schneider <asn@samba.org> Autobuild-User(master): Alexander Bokovoy <ab@samba.org> Autobuild-Date(master): Fri Feb 22 18:18:20 CET 2013 on sn-devel-104
-rwxr-xr-xpackaging/NetworkManager/30-winbind-systemd8
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging/NetworkManager/30-winbind-systemd b/packaging/NetworkManager/30-winbind-systemd
index af0edf9747..9db422afea 100755
--- a/packaging/NetworkManager/30-winbind-systemd
+++ b/packaging/NetworkManager/30-winbind-systemd
@@ -1,6 +1,6 @@
#!/bin/sh
-
-winbind_is_active=$(/bin/systemctl is-active winbind.service)
+SYSTEMCTL=/bin/systemctl
+winbind_is_active=$($SYSTEMCTL is-active winbind.service)
test "${winbind_is_active}" = "active" || exit 0
winbind_offline_logon=$(testparm -s --parameter-name "winbind offline logon" 2>/dev/null)
@@ -8,9 +8,9 @@ test "${winbind_offline_logon}" = "Yes" || exit 0
case "$2" in
up|vpn-up)
- nmb_is_active=$(/bin/systemctl is-active nmb.service)
+ nmb_is_active=$($SYSTEMCTL is-active nmb.service)
if test "${nmb_is_active}" = "active"; then
- /bin/systemctl try-restart nmb.service || :
+ $SYSTEMCTL try-restart nmb.service || :
fi
/usr/bin/smbcontrol winbind online || :
;;