From c808214f56e33f926e3d9eb98b1ed20d6dedda9a101521ab9b215f58a0cfe5d1 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Tue, 18 Jan 2022 20:40:06 +0000
Subject: [PATCH] - Restore /sbin/udevadm and /bin/systemctl (obsolete) paths
 when split_usr is   true (bsc#1194519)

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1227
---
 systemd.changes |  6 ++++++
 systemd.spec    | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/systemd.changes b/systemd.changes
index 89974cf9..9b1bd549 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -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>
 
diff --git a/systemd.spec b/systemd.spec
index 64efc662..f4ead050 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -741,8 +741,11 @@ for s in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do
 done
 
 %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
-mkdir -p %{buildroot}/sbin
 ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init
 ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot
 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.
 ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf
 
-# The definition of the basic users/groups are defined by system-user
-# on SUSE (bsc#1006978).
+# The definitions of the basic users/groups are given by system-user package on
+# SUSE (bsc#1006978).
 rm -f %{buildroot}%{_sysusersdir}/basic.conf
 
 # Remove README file in init.d as (SUSE) rpm requires executable files
@@ -1276,6 +1279,9 @@ fi
 %{_bindir}/systemd-cgls
 %{_bindir}/systemd-cgtop
 %{_bindir}/systemd-cat
+%if %{with split_usr}
+/bin/systemctl
+%endif
 %dir %{_prefix}/lib/kernel
 %dir %{_prefix}/lib/kernel/install.d
 %{_prefix}/lib/kernel/install.d/00-entry-directory.install
@@ -1618,6 +1624,9 @@ fi
 %defattr(-,root,root)
 %{_bindir}/udevadm
 %{_bindir}/systemd-hwdb
+%if %{with split_usr}
+/sbin/udevadm
+%endif
 %dir %{_prefix}/lib/udev/
 %{_prefix}/lib/udev/ata_id
 %{_prefix}/lib/udev/cdrom_id