summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-06-20 12:05:43 -0400
committerMike Gilbert <floppym@gentoo.org>2021-06-20 13:18:47 -0400
commit7882a746a7db7bfd78784716746104e1ebd2454b (patch)
treee36efbfc8b812755e26c34500d99b6c3e6354978 /sys-apps/systemd
parentsys-block/blktrace: new upstream release after 4 years. (diff)
downloadgentoo-7882a746a7db7bfd78784716746104e1ebd2454b.tar.gz
gentoo-7882a746a7db7bfd78784716746104e1ebd2454b.tar.bz2
gentoo-7882a746a7db7bfd78784716746104e1ebd2454b.zip
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@gentoo.org>
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild20
1 files changed, 1 insertions, 19 deletions
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 6c3c1ef813c4..8dd85417f98c 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 getty@tty1.service
-
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 getty@.service remote-fs.target || FAIL=1