diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2022-05-03 15:59:09 -0700 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2022-05-06 11:33:55 -0700 |
| commit | 3120aad0e95fe0963199bd1a57526cdacc5ad3ec (patch) | |
| tree | ba0e42ad11173c83bdc71b9df22afe27ea030709 | |
| parent | profiles: update chromium mask (diff) | |
| download | gentoo-3120aad0.tar.gz gentoo-3120aad0.tar.bz2 gentoo-3120aad0.zip | |
sys-apps/systemd: remove hostnamed-fallback from live ebuild
this was added before we had policykit working with duktape
now duktape support in polkit landed, and is the default in gentoo
systemd-hostnamed should function without this workaround, and without
pulling llvm+rust+spidermonkey via polkit.
Closes: https://github.com/gentoo/gentoo/pull/25312
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 3069cafa856d..044df638afe4 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -32,7 +32,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" IUSE=" acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils - fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod + fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd " @@ -40,7 +40,6 @@ REQUIRED_USE=" dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) - policykit? ( !hostnamed-fallback ) pwquality? ( homed ) " RESTRICT="!test? ( test )" @@ -118,10 +117,6 @@ RDEPEND="${COMMON_DEPEND} >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 - hostnamed-fallback? ( - acct-group/systemd-hostname - sys-apps/dbus-broker - ) selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] @@ -407,16 +402,6 @@ multilib_src_install_all() { dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown fi - # workaround for https://github.com/systemd/systemd/issues/13501 - if use hostnamed-fallback; then - # this file requires dbus-broker - insinto /usr/share/dbus-1/system.d/ - doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf" - - insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/" - doins "${FILESDIR}/00-hostnamed-network-user.conf" - fi - gen_usr_ldscript -a systemd udev } @@ -513,14 +498,6 @@ pkg_postinst() { eerror "systemd again." eerror fi - - if use hostnamed-fallback; then - if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then - ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run." - ewarn "To enable dbus-broker.service run the next command as root:" - ewarn "systemctl enable dbus-broker.service" - fi - fi } pkg_prerm() { |