| 1 |
commit: 99401396dd0ae8cee0c5dde7137ac751142e8558 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 4 15:27:32 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 4 15:27:32 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99401396 |
| 7 |
|
| 8 |
sys-apps/systemd: fixup save_enabled_units |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/systemd/systemd-242_rc2.ebuild | 3 ++- |
| 14 |
sys-apps/systemd/systemd-9999.ebuild | 3 ++- |
| 15 |
2 files changed, 4 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/systemd/systemd-242_rc2.ebuild b/sys-apps/systemd/systemd-242_rc2.ebuild |
| 18 |
index 0be24409401..bbb07c49e43 100644 |
| 19 |
--- a/sys-apps/systemd/systemd-242_rc2.ebuild |
| 20 |
+++ b/sys-apps/systemd/systemd-242_rc2.ebuild |
| 21 |
@@ -393,7 +393,8 @@ migrate_locale() { |
| 22 |
} |
| 23 |
|
| 24 |
save_enabled_units() { |
| 25 |
- [[ -z ${ROOT} ]] || return |
| 26 |
+ ENABLED_UNITS=() |
| 27 |
+ type systemctl &>/dev/null || return |
| 28 |
for x; do |
| 29 |
if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then |
| 30 |
ENABLED_UNITS+=( "${x}" ) |
| 31 |
|
| 32 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 33 |
index 0be24409401..bbb07c49e43 100644 |
| 34 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 35 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 36 |
@@ -393,7 +393,8 @@ migrate_locale() { |
| 37 |
} |
| 38 |
|
| 39 |
save_enabled_units() { |
| 40 |
- [[ -z ${ROOT} ]] || return |
| 41 |
+ ENABLED_UNITS=() |
| 42 |
+ type systemctl &>/dev/null || return |
| 43 |
for x; do |
| 44 |
if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then |
| 45 |
ENABLED_UNITS+=( "${x}" ) |
Archives