Accepting request 863306 from home:kukuk:etc

- Use systemd-sysusers as default to create and update the user
  account. Fixes the problem that a modified sysusers config file
  get's ignored by useradd and adduser [bsc#1180549].

OBS-URL: https://build.opensuse.org/request/show/863306
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysuser-tools?expand=0&rev=34

sysuser-tools.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 14 14:30:20 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
+
+- Use systemd-sysusers as default to create and update the user
+  account. Fixes the problem that a modified sysusers config file
+  get's ignored by useradd and adduser [bsc#1180549].
+
 -------------------------------------------------------------------
 Fri Dec  4 10:54:00 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 

sysuser-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sysuser-tools
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,7 @@ Generate auto provides for system users.
 %package -n sysuser-shadow
 Summary:        Tool to execute sysusers.d with shadow utilities
 Group:          System/Packages
-PreReq:         useradd_or_adduser_dep
+Requires(pre):  (/usr/sbin/useradd or busybox or /usr/bin/systemd-sysusers)
 # prefer original shadow over busybox by default
 Suggests:       shadow
 

sysusers2shadow.sh

@@ -7,12 +7,19 @@ run() {
 	"$@"
 }
 
-# Absolute path to busybox, if found
-busybox=
-for i in /bin/busybox /usr/bin/busybox; do [ -x "$i" ] && busybox=$i; done
+if [ -x /usr/bin/systemd-sysusers ]; then
 
-while read LINE
-do
+    # Use systemd-sysusers and let it read the input directly from stdin
+    /usr/bin/systemd-sysusers -
+
+else
+
+    # Absolute path to busybox, if found
+    busybox=
+    for i in /bin/busybox /usr/bin/busybox; do [ -x "$i" ] && busybox=$i; done
+
+    while read LINE
+    do
 	# "eval set" to do proper splitting while respecting quotes
 	eval set -- $LINE
 	case "${1-}" in
@@ -88,4 +95,5 @@ do
 		exit 1
 		;;
 	esac
-done
+    done
+fi