| 1 |
commit: 9d190af4dfb4101ea252a2fdcb6630af851390a2 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 4 00:34:05 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 4 00:34:05 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d190af4 |
| 7 |
|
| 8 |
sys-apps/systemd: bump to 242_rc2 |
| 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/Manifest | 1 + |
| 14 |
...{systemd-9999.ebuild => systemd-242_rc2.ebuild} | 27 ++++++++++++++-------- |
| 15 |
sys-apps/systemd/systemd-9999.ebuild | 27 ++++++++++++++-------- |
| 16 |
3 files changed, 35 insertions(+), 20 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest |
| 19 |
index 30f8aac4e80..eff863d22c7 100644 |
| 20 |
--- a/sys-apps/systemd/Manifest |
| 21 |
+++ b/sys-apps/systemd/Manifest |
| 22 |
@@ -1,3 +1,4 @@ |
| 23 |
DIST systemd-239-patches-2.tar.gz 33416 BLAKE2B 9602d101cbac65d3b2490f28308e843c28fcaea848dd09005abef0da0bc79ba0766a1cbe7c3cac63f796accddf0295b4eb946e601a201f7e81a48bd1720051ca SHA512 5f5a764d317c43c6b1854171a753eafaca006e12e4f91c81e6ba1d50e80bbbaca23c900fba417264bf9f0d827a73aca71a6da8f2a2043aaaefefed62f5a92b23 |
| 24 |
DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f |
| 25 |
DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e |
| 26 |
+DIST systemd-242-rc2.tar.gz 7816915 BLAKE2B 3eb6bea6d780b99ead7811050e1ac1e881263df441186844fb4cb28ff2994c52148171332d34962c65834d08f82a80c3ac69ee4c63738fe06e1401f761ceb23e SHA512 0864999fae72613902665d7c3feccf17bb6b5c505267c124278ac7f742201d4858a15801c90021735c7c137cce9b82da4f36a59a012889a7eabff44fad984dc2 |
| 27 |
|
| 28 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-242_rc2.ebuild |
| 29 |
similarity index 95% |
| 30 |
copy from sys-apps/systemd/systemd-9999.ebuild |
| 31 |
copy to sys-apps/systemd/systemd-242_rc2.ebuild |
| 32 |
index 852df051610..0be24409401 100644 |
| 33 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 34 |
+++ b/sys-apps/systemd/systemd-242_rc2.ebuild |
| 35 |
@@ -336,16 +336,6 @@ multilib_src_install_all() { |
| 36 |
# Symlink /etc/sysctl.conf for easy migration. |
| 37 |
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf |
| 38 |
|
| 39 |
- # If we install these symlinks, there is no way for the sysadmin to remove them |
| 40 |
- # permanently. |
| 41 |
- rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die |
| 42 |
- rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die |
| 43 |
- rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die |
| 44 |
- rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die |
| 45 |
- rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die |
| 46 |
- rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die |
| 47 |
- rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die |
| 48 |
- |
| 49 |
local udevdir=/lib/udev |
| 50 |
use split-usr || udevdir=/usr/lib/udev |
| 51 |
|
| 52 |
@@ -402,6 +392,19 @@ migrate_locale() { |
| 53 |
fi |
| 54 |
} |
| 55 |
|
| 56 |
+save_enabled_units() { |
| 57 |
+ [[ -z ${ROOT} ]] || return |
| 58 |
+ for x; do |
| 59 |
+ if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then |
| 60 |
+ ENABLED_UNITS+=( "${x}" ) |
| 61 |
+ fi |
| 62 |
+ done |
| 63 |
+} |
| 64 |
+ |
| 65 |
+pkg_preinst() { |
| 66 |
+ save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@××××.service |
| 67 |
+} |
| 68 |
+ |
| 69 |
pkg_postinst() { |
| 70 |
newusergroup() { |
| 71 |
enewgroup "$1" |
| 72 |
@@ -437,6 +440,10 @@ pkg_postinst() { |
| 73 |
|
| 74 |
systemd_reenable systemd-networkd.service systemd-resolved.service |
| 75 |
|
| 76 |
+ if [[ ${ENABLED_UNITS[@]} ]]; then |
| 77 |
+ systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" |
| 78 |
+ fi |
| 79 |
+ |
| 80 |
if [[ -z ${ROOT} && -d /run/systemd/system ]]; then |
| 81 |
ebegin "Reexecuting system manager" |
| 82 |
systemctl daemon-reexec |
| 83 |
|
| 84 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 85 |
index 852df051610..0be24409401 100644 |
| 86 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 87 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 88 |
@@ -336,16 +336,6 @@ multilib_src_install_all() { |
| 89 |
# Symlink /etc/sysctl.conf for easy migration. |
| 90 |
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf |
| 91 |
|
| 92 |
- # If we install these symlinks, there is no way for the sysadmin to remove them |
| 93 |
- # permanently. |
| 94 |
- rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die |
| 95 |
- rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die |
| 96 |
- rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die |
| 97 |
- rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die |
| 98 |
- rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die |
| 99 |
- rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die |
| 100 |
- rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die |
| 101 |
- |
| 102 |
local udevdir=/lib/udev |
| 103 |
use split-usr || udevdir=/usr/lib/udev |
| 104 |
|
| 105 |
@@ -402,6 +392,19 @@ migrate_locale() { |
| 106 |
fi |
| 107 |
} |
| 108 |
|
| 109 |
+save_enabled_units() { |
| 110 |
+ [[ -z ${ROOT} ]] || return |
| 111 |
+ for x; do |
| 112 |
+ if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then |
| 113 |
+ ENABLED_UNITS+=( "${x}" ) |
| 114 |
+ fi |
| 115 |
+ done |
| 116 |
+} |
| 117 |
+ |
| 118 |
+pkg_preinst() { |
| 119 |
+ save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@××××.service |
| 120 |
+} |
| 121 |
+ |
| 122 |
pkg_postinst() { |
| 123 |
newusergroup() { |
| 124 |
enewgroup "$1" |
| 125 |
@@ -437,6 +440,10 @@ pkg_postinst() { |
| 126 |
|
| 127 |
systemd_reenable systemd-networkd.service systemd-resolved.service |
| 128 |
|
| 129 |
+ if [[ ${ENABLED_UNITS[@]} ]]; then |
| 130 |
+ systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" |
| 131 |
+ fi |
| 132 |
+ |
| 133 |
if [[ -z ${ROOT} && -d /run/systemd/system ]]; then |
| 134 |
ebegin "Reexecuting system manager" |
| 135 |
systemctl daemon-reexec |
Archives