commit:     dc2218c97fed493ded478538f5b64176b3149c3e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 16:07:33 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 16:07:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2218c9

sys-apps/systemd: override debug-shell and default-user-shell

We need to match /etc/shells to allow users to log in.

Closes: https://bugs.gentoo.org/919749
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/{systemd-255.3.ebuild => systemd-255.3-r1.ebuild} | 3 +++
 sys-apps/systemd/systemd-9999.ebuild                               | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sys-apps/systemd/systemd-255.3.ebuild 
b/sys-apps/systemd/systemd-255.3-r1.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-255.3.ebuild
rename to sys-apps/systemd/systemd-255.3-r1.ebuild
index 2e6dc0eacdce..6297e312e107 100644
--- a/sys-apps/systemd/systemd-255.3.ebuild
+++ b/sys-apps/systemd/systemd-255.3-r1.ebuild
@@ -287,6 +287,9 @@ multilib_src_configure() {
                # no deps
                -Dima=true
                -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+               # Match /etc/shells, bug 919749
+               -Ddebug-shell="${EPREFIX}/bin/sh"
+               -Ddefault-user-shell="${EPREFIX}/bin/bash"
                # Optional components/dependencies
                $(meson_native_use_bool acl)
                $(meson_native_use_bool apparmor)

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index 85965aed1d27..6437ef1e3b47 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -287,6 +287,9 @@ multilib_src_configure() {
                # no deps
                -Dima=true
                -Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+               # Match /etc/shells, bug 919749
+               -Ddebug-shell="${EPREFIX}/bin/sh"
+               -Ddefault-user-shell="${EPREFIX}/bin/bash"
                # Optional components/dependencies
                $(meson_native_use_bool acl)
                $(meson_native_use_bool apparmor)

Reply via email to