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

- Restore /sbin/udevadm and /bin/systemctl (obsolete) paths when split_usr is

Browse Source 
true (bsc#1194519)

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1227
This commit is contained in:
Franck Bui 2022-01-18 20:40:06 +00:00 committed by Git OBS Bridge
parent bfa6b12ff4
commit c808214f56
2 changed files with 18 additions and 3 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 Jan 18 17:57:43 UTC 2022 - Franck Bui <fbui@suse.com>
- Restore /sbin/udevadm and /bin/systemctl (obsolete) paths when split_usr is
true (bsc#1194519)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 17 09:16:13 UTC 2022 - Franck Bui <fbui@suse.com> Mon Jan 17 09:16:13 UTC 2022 - Franck Bui <fbui@suse.com>

15
systemd.spec
View File

@ -741,8 +741,11 @@ for s in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do
done done
%if %{with split_usr} %if %{with split_usr}
mkdir -p %{buildroot}/{bin,sbin}
# Legacy paths
ln -s ../usr/bin/udevadm %{buildroot}/sbin/
ln -s ../usr/bin/systemctl %{buildroot}/bin/
# Legacy sysvinit tools # Legacy sysvinit tools
mkdir -p %{buildroot}/sbin
ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init
ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot
ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt
@ -782,8 +785,8 @@ mv %{buildroot}%{_datadir}/polkit-1/rules.d/systemd-networkd.rules \
# /usr/lib/sysctl.d/99-sysctl.conf. # /usr/lib/sysctl.d/99-sysctl.conf.
ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf
# The definition of the basic users/groups are defined by system-user # The definitions of the basic users/groups are given by system-user package on
# on SUSE (bsc#1006978). # SUSE (bsc#1006978).
rm -f %{buildroot}%{_sysusersdir}/basic.conf rm -f %{buildroot}%{_sysusersdir}/basic.conf
# Remove README file in init.d as (SUSE) rpm requires executable files # Remove README file in init.d as (SUSE) rpm requires executable files
@ -1276,6 +1279,9 @@ fi
%{_bindir}/systemd-cgls %{_bindir}/systemd-cgls
%{_bindir}/systemd-cgtop %{_bindir}/systemd-cgtop
%{_bindir}/systemd-cat %{_bindir}/systemd-cat
%if %{with split_usr}
/bin/systemctl
%endif
%dir %{_prefix}/lib/kernel %dir %{_prefix}/lib/kernel
%dir %{_prefix}/lib/kernel/install.d %dir %{_prefix}/lib/kernel/install.d
%{_prefix}/lib/kernel/install.d/00-entry-directory.install %{_prefix}/lib/kernel/install.d/00-entry-directory.install
@ -1618,6 +1624,9 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/udevadm %{_bindir}/udevadm
%{_bindir}/systemd-hwdb %{_bindir}/systemd-hwdb
%if %{with split_usr}
/sbin/udevadm
%endif
%dir %{_prefix}/lib/udev/ %dir %{_prefix}/lib/udev/
%{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/ata_id
%{_prefix}/lib/udev/cdrom_id %{_prefix}/lib/udev/cdrom_id