From a12af383c37379c89c0584d0f2e0b3d43586a56a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 26 Jan 2013 19:14:46 +0000 Subject: [PATCH] Reduce some unnecessary output in Arch post install functions. --- bootstrap-salt-minion.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/bootstrap-salt-minion.sh b/bootstrap-salt-minion.sh index 54ad25f..361b784 100755 --- a/bootstrap-salt-minion.sh +++ b/bootstrap-salt-minion.sh @@ -923,13 +923,14 @@ install_arch_post() { if [ -f /usr/bin/systemctl ]; then # Using systemd - /usr/bin/systemctl is-enabled salt-$fname.service || ( - /usr/bin/systemctl preset salt-$fname.service && /usr/bin/systemctl enable salt-$fname.service + /usr/bin/systemctl is-enabled salt-$fname.service /dev/null 2>&1 || ( + /usr/bin/systemctl preset salt-$fname.service /dev/null 2>&1 && + /usr/bin/systemctl enable salt-$fname.service /dev/null 2>&1 ) sleep 0.1 - systemctl daemon-reload + /usr/bin/systemctl daemon-reload sleep 0.1 - systemctl try-restart salt-$fname.service + /usr/bin/systemctl try-restart salt-$fname.service continue fi /etc/rc.d/salt-$fname start @@ -947,13 +948,14 @@ install_arch_git_post() { if [ -f /usr/bin/systemctl ]; then cp ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-$fname.service /lib/systemd/system/salt-$fname.service - /usr/bin/systemctl is-enabled salt-$fname.service || ( - /usr/bin/systemctl preset salt-$fname.service && /usr/bin/systemctl enable salt-$fname.service + /usr/bin/systemctl is-enabled salt-$fname.service /dev/null 2>&1 || ( + /usr/bin/systemctl preset salt-$fname.service /dev/null 2>&1 && + /usr/bin/systemctl enable salt-$fname.service /dev/null 2>&1 ) sleep 0.1 - systemctl daemon-reload + /usr/bin/systemctl daemon-reload sleep 0.1 - systemctl try-restart salt-$fname.service + /usr/bin/systemctl try-restart salt-$fname.service continue fi