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

- Conditionalize the use of /lib/modprobe.d only on systems with split usr

Browse Source 
support enabled (i.e. SLE).

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1346
This commit is contained in:
Franck Bui 2023-02-07 08:56:44 +00:00 committed by Git OBS Bridge
parent 976930de58
commit 4b5dfd9d8c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 7 08:44:32 UTC 2023 - Franck Bui <fbui@suse.com>
- Conditionalize the use of /lib/modprobe.d only on systems with split usr
support enabled (i.e. SLE).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 30 08:39:24 UTC 2023 - Franck Bui <fbui@suse.com> Mon Jan 30 08:39:24 UTC 2023 - Franck Bui <fbui@suse.com>

10
systemd.spec
View File

@ -780,6 +780,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff
ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit
ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel
%endif %endif
# kmod keeps insisting on using /lib/modprobe.d only.
mkdir -p %{buildroot}%{_modprobedir}
mv %{buildroot}/usr/lib/modprobe.d/* %{buildroot}%{_modprobedir}/
%endif %endif
# Make sure we don't ship static enablement symlinks in /etc during # Make sure we don't ship static enablement symlinks in /etc during
@ -790,12 +794,6 @@ rm -f %{buildroot}/etc/systemd/system/default.target
# Replace upstream systemd-user with the openSUSE one. # Replace upstream systemd-user with the openSUSE one.
install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2} install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2}
# kmod keeps insisting on using /lib on SLE.
if [ "$(realpath %{_modprobedir})" != /usr/lib/modprobe.d ]; then
mkdir -p %{buildroot}%{_modprobedir}
mv %{buildroot}/usr/lib/modprobe.d/* %{buildroot}%{_modprobedir}/
fi
# Don't enable wall ask password service, it spams every console (bnc#747783). # Don't enable wall ask password service, it spams every console (bnc#747783).
rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path