From b18e67095513d74faa44b5b484a731fffb93c0db Mon Sep 17 00:00:00 2001
From: Elias Probst <mail@eliasprobst.eu>
Date: Tue, 24 Sep 2013 02:17:10 +0200
Subject: [PATCH] [gentoo] also apply the config protection bypass when
 installing the salt package itself, not only for its dependencies.

---
 bootstrap-salt.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 550878d..452cf89 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2823,10 +2823,12 @@ install_gentoo_git_deps() {
 }
 
 install_gentoo_stable() {
+    __gentoo_config_protection
     __emerge -v 'app-admin/salt' || return 1
 }
 
 install_gentoo_git() {
+    __gentoo_config_protection
     __emerge -v '=app-admin/salt-9999' || return 1
 }
 
@@ -2838,8 +2840,13 @@ install_gentoo_post() {
         [ $fname = "master" ] && [ $_INSTALL_MASTER -eq $BS_FALSE ] && continue
         [ $fname = "syndic" ] && [ $_INSTALL_SYNDIC -eq $BS_FALSE ] && continue
 
-        rc-update add salt-$fname default
-        /etc/init.d/salt-$fname start
+        if [ -d "/run/systemd/system" ]; then
+            systemctl enable salt-$fname.service
+            systemctl start salt-$fname.service
+        else
+            rc-update add salt-$fname default
+            /etc/init.d/salt-$fname start
+        fi
     done
 }