Accepting request 903400 from home:kukuk:branches:Base:System

- login.defs/MOTD_FILE: Use "" instead of blank entry [bsc#1187536]
- Add /etc/login.defs.d directory

OBS-URL: https://build.opensuse.org/request/show/903400
OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=105
This commit is contained in:
Michael Vetter 2021-07-02 06:52:55 +00:00 committed by Git OBS Bridge
parent faf07ff787
commit e27cf8c34f
3 changed files with 9 additions and 1 deletions

View File

@ -20,7 +20,7 @@ Index: etc/login.defs
#
-MOTD_FILE /etc/motd
-#MOTD_FILE /etc/motd:/usr/lib/news/news-motd
+MOTD_FILE
+MOTD_FILE ""
+#MOTD_FILE /etc/motd:/usr/share/misc/motd
#

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 1 11:51:39 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
- login.defs/MOTD_FILE: Use "" instead of blank entry [bsc#1187536]
- Add /etc/login.defs.d directory
-------------------------------------------------------------------
Sat Jun 5 13:38:52 UTC 2021 - Maurizio Galli <maurizio.galli@gmail.com>

View File

@ -225,6 +225,7 @@ rm -rf %{buildroot}%{_mandir}/{??,??_??}
if [ ! -d %{buildroot}%{_distconfdir} ]; then
mkdir -p %{buildroot}%{_distconfdir}
mv %{buildroot}%{_sysconfdir}/{login.defs,pam.d} %{buildroot}%{_distconfdir}
mkdir -p %{buildroot}%{_sysconfdir}/login.defs.d
fi
%find_lang shadow
@ -379,6 +380,7 @@ test -f /etc/login.defs.rpmsave && mv -v /etc/login.defs.rpmsave /etc/login.defs
%files -n login_defs
%if %{defined no_config}
%dir /etc/login.defs.d
%attr(0644,root,root) %{_distconfdir}/login.defs
%else
%attr(0644,root,root) %config %{_sysconfdir}/login.defs