Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date: Mon, 12 Aug 2019 14:12:13
Message-Id: 1565619122.d80667d80ec11906c6b3b570f5bb9a55a0e7b318.floppym@gentoo
1 commit: d80667d80ec11906c6b3b570f5bb9a55a0e7b318
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 12 14:11:15 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 12 14:12:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d80667d8
7
8 sys-apps/systemd: enable some basic services for new installs
9
10 Also update the preset-all postinst message.
11
12 Bug: https://bugs.gentoo.org/691854
13 Package-Manager: Portage-2.3.71, Repoman-2.3.16_p24
14 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
15
16 sys-apps/systemd/systemd-242-r6.ebuild | 13 ++++++++-----
17 sys-apps/systemd/systemd-243_rc1-r2.ebuild | 13 ++++++++-----
18 sys-apps/systemd/systemd-9999.ebuild | 13 ++++++++-----
19 3 files changed, 24 insertions(+), 15 deletions(-)
20
21 diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild
22 index 96430b07ddd..ca3aee2f6d1 100644
23 --- a/sys-apps/systemd/systemd-242-r6.ebuild
24 +++ b/sys-apps/systemd/systemd-242-r6.ebuild
25 @@ -465,6 +465,14 @@ pkg_postinst() {
26 systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
27 fi
28
29 + if [[ -z ${REPLACING_VERSIONS} ]]; then
30 + if type systemctl &>/dev/null; then
31 + systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
32 + fi
33 + elog "To enable a useful set of services, run the following:"
34 + elog " systemctl preset-all --preset-mode=enable-only"
35 + fi
36 +
37 if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
38 rm "${EROOT}/var/lib/systemd/timesync"
39 fi
40 @@ -481,11 +489,6 @@ pkg_postinst() {
41 eerror "systemd again."
42 eerror
43 fi
44 -
45 - if [[ -z ${REPLACING_VERSIONS} ]]; then
46 - elog "To enable a useful set of services, run the following:"
47 - elog " systemctl preset-all"
48 - fi
49 }
50
51 pkg_prerm() {
52
53 diff --git a/sys-apps/systemd/systemd-243_rc1-r2.ebuild b/sys-apps/systemd/systemd-243_rc1-r2.ebuild
54 index d67b45ec87d..988973dd9a7 100644
55 --- a/sys-apps/systemd/systemd-243_rc1-r2.ebuild
56 +++ b/sys-apps/systemd/systemd-243_rc1-r2.ebuild
57 @@ -449,6 +449,14 @@ pkg_postinst() {
58 systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
59 fi
60
61 + if [[ -z ${REPLACING_VERSIONS} ]]; then
62 + if type systemctl &>/dev/null; then
63 + systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
64 + fi
65 + elog "To enable a useful set of services, run the following:"
66 + elog " systemctl preset-all --preset-mode=enable-only"
67 + fi
68 +
69 if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
70 rm "${EROOT}/var/lib/systemd/timesync"
71 fi
72 @@ -465,11 +473,6 @@ pkg_postinst() {
73 eerror "systemd again."
74 eerror
75 fi
76 -
77 - if [[ -z ${REPLACING_VERSIONS} ]]; then
78 - elog "To enable a useful set of services, run the following:"
79 - elog " systemctl preset-all"
80 - fi
81 }
82
83 pkg_prerm() {
84
85 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
86 index c4350573c99..7556cea0b55 100644
87 --- a/sys-apps/systemd/systemd-9999.ebuild
88 +++ b/sys-apps/systemd/systemd-9999.ebuild
89 @@ -445,6 +445,14 @@ pkg_postinst() {
90 systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
91 fi
92
93 + if [[ -z ${REPLACING_VERSIONS} ]]; then
94 + if type systemctl &>/dev/null; then
95 + systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
96 + fi
97 + elog "To enable a useful set of services, run the following:"
98 + elog " systemctl preset-all --preset-mode=enable-only"
99 + fi
100 +
101 if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
102 rm "${EROOT}/var/lib/systemd/timesync"
103 fi
104 @@ -461,11 +469,6 @@ pkg_postinst() {
105 eerror "systemd again."
106 eerror
107 fi
108 -
109 - if [[ -z ${REPLACING_VERSIONS} ]]; then
110 - elog "To enable a useful set of services, run the following:"
111 - elog " systemctl preset-all"
112 - fi
113 }
114
115 pkg_prerm() {