From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 4 Apr 2019 15:27:32 +0000 (-0400)
Subject: sys-apps/systemd: fixup save_enabled_units
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=99401396dd0ae8cee0c5dde7137ac751142e8558;p=gentoo.git

sys-apps/systemd: fixup save_enabled_units

Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---

diff --git a/sys-apps/systemd/systemd-242_rc2.ebuild b/sys-apps/systemd/systemd-242_rc2.ebuild
index 0be244094018..bbb07c49e43b 100644
--- a/sys-apps/systemd/systemd-242_rc2.ebuild
+++ b/sys-apps/systemd/systemd-242_rc2.ebuild
@@ -393,7 +393,8 @@ migrate_locale() {
 }
 
 save_enabled_units() {
-	[[ -z ${ROOT} ]] || return
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
 	for x; do
 		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
 			ENABLED_UNITS+=( "${x}" )
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 0be244094018..bbb07c49e43b 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -393,7 +393,8 @@ migrate_locale() {
 }
 
 save_enabled_units() {
-	[[ -z ${ROOT} ]] || return
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
 	for x; do
 		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
 			ENABLED_UNITS+=( "${x}" )