From 33fd4af08eb4174cb2ed8daa3b1de49dbf4028d7 Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@gentoo.org>
Date: Wed, 5 Dec 2018 19:33:52 +0100
Subject: [PATCH] Handle systemd path migration

---
 scripts/inner_chroot_script.sh                           | 4 ++--
 scripts/remaster_generic_inner_chroot_script_after.sh    | 4 ++--
 scripts/remaster_serverbase_inner_chroot_script_after.sh | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh
index 6abaae8..4947eef 100755
--- a/scripts/inner_chroot_script.sh
+++ b/scripts/inner_chroot_script.sh
@@ -27,14 +27,14 @@ safe_run() {
 sd_enable() {
 	local srv="${1}"
 	local ext=".${2:-service}"
-	[[ -x /usr/bin/systemctl ]] && \
+	[[ -x /bin/systemctl ]] && \
 		systemctl --no-reload enable -f "${srv}${ext}"
 }
 
 sd_disable() {
 	local srv="${1}"
 	local ext=".${2:-service}"
-	[[ -x /usr/bin/systemctl ]] && \
+	[[ -x /bin/systemctl ]] && \
 		systemctl --no-reload disable -f "${srv}${ext}"
 }
 
diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 3d195c7..0a6dad8 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -33,14 +33,14 @@ install_kernel_packages() {
 sd_enable() {
 	local srv="${1}"
 	local ext=".${2:-service}"
-	[[ -x /usr/bin/systemctl ]] && \
+	[[ -x /bin/systemctl ]] && \
 		systemctl --no-reload enable -f "${srv}${ext}"
 }
 
 sd_disable() {
 	local srv="${1}"
 	local ext=".${2:-service}"
-	[[ -x /usr/bin/systemctl ]] && \
+	[[ -x /bin/systemctl ]] && \
 		systemctl --no-reload disable -f "${srv}${ext}"
 }
 
diff --git a/scripts/remaster_serverbase_inner_chroot_script_after.sh b/scripts/remaster_serverbase_inner_chroot_script_after.sh
index eb0f794..7583bd8 100755
--- a/scripts/remaster_serverbase_inner_chroot_script_after.sh
+++ b/scripts/remaster_serverbase_inner_chroot_script_after.sh
@@ -4,12 +4,12 @@
 . /etc/profile
 
 sd_enable() {
-	[[ -x /usr/bin/systemctl ]] && \
+	[[ -x /bin/systemctl ]] && \
 		systemctl --no-reload -f enable "${1}.service"
 }
 
 sd_disable() {
-	[[ -x /usr/bin/systemctl ]] && \
+	[[ -x /bin/systemctl ]] && \
 		systemctl --no-reload -f disable "${1}.service"
 }