From: Karel Zak Date: Tue, 12 May 2020 13:37:39 +0000 (+0200) Subject: login: keep default MOTD_FILE= backwardly compatible X-Git-Tag: v2.36-rc1~103 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72b155ea6e25730d7c01d345cc2df269c2c47635;p=thirdparty%2Futil-linux.git login: keep default MOTD_FILE= backwardly compatible It seems that directories like /etc/motd.d are already used by PAM or by another stuff. Let's keep it in admin/distro hands and do not change the current default. Signed-off-by: Karel Zak --- diff --git a/include/pathnames.h b/include/pathnames.h index fac3a07831..3845d4c331 100644 --- a/include/pathnames.h +++ b/include/pathnames.h @@ -41,7 +41,7 @@ #ifndef _PATH_MAILDIR # define _PATH_MAILDIR "/var/spool/mail" #endif -#define _PATH_MOTDFILE "/usr/share/misc/motd:/run/motd:/run/motd.d:/etc/motd:/etc/motd.d" +#define _PATH_MOTDFILE "/usr/share/misc/motd:/run/motd:/etc/motd" #ifndef _PATH_NOLOGIN # define _PATH_NOLOGIN "/etc/nologin" #endif diff --git a/login-utils/login.1 b/login-utils/login.1 index 24cd7d2bc1..8dc77fa433 100644 --- a/login-utils/login.1 +++ b/login-utils/login.1 @@ -156,7 +156,7 @@ to be displayed upon login. If the specified path is a directory then displays all files with .motd file extension in version-sort order from the directory. .PP The default value is -.IR "/usr/share/misc/motd:/run/motd:/run/motd.d:/etc/motd:/etc/motd.d" . +.IR "/usr/share/misc/motd:/run/motd:/etc/motd" . If the .B MOTD_FILE item is empty or a quiet login is enabled, then the message of the day