From d60e82f465de55287144406cc25256732037b0803f42a29b89329aa58afb7271 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Mon, 10 May 2021 13:44:26 +0000
Subject: [PATCH] Accepting request 891513 from home:gmbr3:Active

- Use /usr/sbin/nologin instead of /sbin/nologin

OBS-URL: https://build.opensuse.org/request/show/891513
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysuser-tools?expand=0&rev=43
---
 sysuser-tools.changes | 5 +++++
 sysusers2shadow.sh    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sysuser-tools.changes b/sysuser-tools.changes
index 0c2810d..98e8d9e 100644
--- a/sysuser-tools.changes
+++ b/sysuser-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May  8 13:19:03 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Use /usr/sbin/nologin instead of /sbin/nologin
+
 -------------------------------------------------------------------
 Mon Feb 15 07:30:25 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/sysusers2shadow.sh b/sysusers2shadow.sh
index 7988133..3849f25 100644
--- a/sysusers2shadow.sh
+++ b/sysusers2shadow.sh
@@ -65,13 +65,13 @@ else
 			    ARGUMENTS="-U $ARGUMENTS"
 			fi
 
-			run /usr/sbin/useradd -r -s /sbin/nologin -c "$3" -d "${homedir}" $ARGUMENTS
+			run /usr/sbin/useradd -r -s /usr/sbin/nologin -c "$3" -d "${homedir}" $ARGUMENTS
 		    fi
 		elif [ -x "$busybox" ]; then
 		    /usr/bin/getent group "$1" >> /dev/null || $busybox addgroup -S "$1"
 
 		    if ! /usr/bin/getent passwd "$1" >> /dev/null; then
-			run $busybox adduser -S -H -s /sbin/nologin -g "$3" -G "$1" -h "${homedir}" $ARGUMENTS
+			run $busybox adduser -S -H -s /usr/sbin/nologin -g "$3" -G "$1" -h "${homedir}" $ARGUMENTS
 		    fi
 		else
 		    echo "ERROR: neither useradd nor busybox found!"