commit: 7882a746a7db7bfd78784716746104e1ebd2454b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 16:05:43 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 17:18:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7882a746
sys-apps/systemd: remove code to save/restore enabled units
This was really only needed for a rootprefix transition. Everybody
should have been migrated by now.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/systemd-9999.ebuild | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/sys-apps/systemd/systemd-9999.ebuild
b/sys-apps/systemd/systemd-9999.ebuild
index 6c3c1ef813c..8dd85417f98 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -437,19 +437,7 @@ migrate_locale() {
fi
}
-save_enabled_units() {
- ENABLED_UNITS=()
- type systemctl &>/dev/null || return
- for x; do
- if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
- ENABLED_UNITS+=( "${x}" )
- fi
- done
-}
-
pkg_preinst() {
- save_enabled_units {machines,remote-{cryptsetup,fs}}.target
[email protected]
-
if ! use split-usr; then
local dir
for dir in bin sbin lib; do
@@ -478,16 +466,10 @@ pkg_postinst() {
udev_reload || FAIL=1
- # Bug 465468, make sure locales are respect, and ensure consistency
+ # Bug 465468, make sure locales are respected, and ensure consistency
# between OpenRC & systemd
migrate_locale
- systemd_reenable systemd-networkd.service systemd-resolved.service
-
- if [[ ${ENABLED_UNITS[@]} ]]; then
- systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
- fi
-
if [[ -z ${REPLACING_VERSIONS} ]]; then
if type systemctl &>/dev/null; then
systemctl --root="${ROOT:-/}" enable [email protected]
remote-fs.target || FAIL=1
