various: try to use DEFAULT_USER_SHELL for root too

/bin/sh as a shell is punishing. There is no good reason to make
the occasional root login unpleasant.

Since /bin/sh is usually /bin/bash in compat mode, i.e. if one is
available, the other will be too, /bin/bash is almost as good as a default.
But to avoid a regression in the situation where /bin/bash (or
DEFAULT_USER_SHELL) is not installed, we check with access() and fall back
to /bin/sh. This should make this change in behaviour less risky.

(FWIW, e.g. Fedora/RHEL use /bin/bash as default for root.)

This is a follow-up of sorts for 53350c7bba,
which added the default-user-shell option, but most likely with the idea
of using /bin/bash less ;)

Fixes #24369.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-08-24 10:02:46 +02:00
parent 5f465fda4e
commit 8a7adccbdb
9 changed files with 59 additions and 37 deletions
+1 -1
View File
@@ -398,7 +398,7 @@ static const char* pick_shell(const Item *i) {
if (i->shell)
return i->shell;
if (i->uid_set && i->uid == 0)
return "/bin/sh";
return default_root_shell(arg_root);
return NOLOGIN;
}