dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Restore (maybe temporarly) "pam_config --add systemd"

Browse Source 
During its installation pam-config seems to overwrite the defaults
  shipped by "pam" for "some" reasons (see bsc#1084924)
  No idea why but since pam_systemd is not part of the "pam-config"
  defaults, we need to restore pam_systemd in common-session
  manually...

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1021
This commit is contained in:
Franck Bui 2018-03-13 15:13:50 +00:00 committed by Git OBS Bridge
parent 98fbfff93b
commit f18d5bd9fc
4 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
systemd-mini.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Mar 13 15:07:41 UTC 2018 - fbui@suse.com
- Restore (maybe temporarly) "pam_config --add systemd"
During its installation pam-config seems to overwrite the defaults
shipped by "pam" for "some" reasons (see bsc#1084924)
No idea why but since pam_systemd is not part of the "pam-config"
defaults, we need to restore pam_systemd in common-session
manually...
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 9 09:35:59 UTC 2018 - fbui@suse.com Fri Mar 9 09:35:59 UTC 2018 - fbui@suse.com

9
systemd-mini.spec
View File

@ -124,6 +124,7 @@ Recommends: %{name}-bash-completion
Requires(post): coreutils Requires(post): coreutils
Requires(post): findutils Requires(post): findutils
Requires(post): systemd-presets-branding Requires(post): systemd-presets-branding
Requires(post): pam-config >= 0.79-5
%endif %endif
%if 0%{?bootstrap} %if 0%{?bootstrap}
@ -668,10 +669,14 @@ fi
# especially important for appliance builds to avoid an identical # especially important for appliance builds to avoid an identical
# machine ID in all images. # machine ID in all images.
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
touch %{_sysconfdir}/machine-id touch %{_sysconfdir}/machine-id
chmod 666 %{_sysconfdir}/machine-id chmod 666 %{_sysconfdir}/machine-id
fi fi
%if ! 0%{?bootstrap}
pam-config --add --systemd || :
%endif
%sysusers_create %{_sysusersdir}/systemd.conf %sysusers_create %{_sysusersdir}/systemd.conf
[ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
/usr/lib/systemd/systemd-random-seed save || : /usr/lib/systemd/systemd-random-seed save || :

12
systemd.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Mar 13 15:07:41 UTC 2018 - fbui@suse.com
- Restore (maybe temporarly) "pam_config --add systemd"
During its installation pam-config seems to overwrite the defaults
shipped by "pam" for "some" reasons (see bsc#1084924)
No idea why but since pam_systemd is not part of the "pam-config"
defaults, we need to restore pam_systemd in common-session
manually...
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 9 09:35:59 UTC 2018 - fbui@suse.com Fri Mar 9 09:35:59 UTC 2018 - fbui@suse.com

9
systemd.spec
View File

@ -122,6 +122,7 @@ Recommends: %{name}-bash-completion
Requires(post): coreutils Requires(post): coreutils
Requires(post): findutils Requires(post): findutils
Requires(post): systemd-presets-branding Requires(post): systemd-presets-branding
Requires(post): pam-config >= 0.79-5
%endif %endif
%if 0%{?bootstrap} %if 0%{?bootstrap}
@ -666,10 +667,14 @@ fi
# especially important for appliance builds to avoid an identical # especially important for appliance builds to avoid an identical
# machine ID in all images. # machine ID in all images.
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
touch %{_sysconfdir}/machine-id touch %{_sysconfdir}/machine-id
chmod 666 %{_sysconfdir}/machine-id chmod 666 %{_sysconfdir}/machine-id
fi fi
%if ! 0%{?bootstrap}
pam-config --add --systemd || :
%endif
%sysusers_create %{_sysusersdir}/systemd.conf %sysusers_create %{_sysusersdir}/systemd.conf
[ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
/usr/lib/systemd/systemd-random-seed save || : /usr/lib/systemd/systemd-random-seed save || :