Hello community, here is the log from the commit of package sysuser-tools for openSUSE:Factory checked in at 2020-01-20 22:47:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysuser-tools (Old) and /work/SRC/openSUSE:Factory/.sysuser-tools.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysuser-tools" Mon Jan 20 22:47:13 2020 rev:8 rq:759949 version:3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sysuser-tools/sysuser-tools.changes 2019-08-05 11:18:28.122508903 +0200 +++ /work/SRC/openSUSE:Factory/.sysuser-tools.new.26092/sysuser-tools.changes 2020-01-20 22:47:14.775154283 +0100 @@ -1,0 +2,6 @@ +Sun Dec 29 19:16:13 UTC 2019 - [email protected] + +- Look for /bin/busybox, too +- Add special handling for busybox and groups + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysuser-tools.spec ++++++ --- /var/tmp/diff_new_pack.lw4Dkv/_old 2020-01-20 22:47:17.111155182 +0100 +++ /var/tmp/diff_new_pack.lw4Dkv/_new 2020-01-20 22:47:17.151155197 +0100 @@ -1,7 +1,7 @@ # # spec file for package sysuser-tools # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ sysusers2shadow.sh ++++++ --- /var/tmp/diff_new_pack.lw4Dkv/_old 2020-01-20 22:47:18.007155527 +0100 +++ /var/tmp/diff_new_pack.lw4Dkv/_new 2020-01-20 22:47:18.007155527 +0100 @@ -17,6 +17,9 @@ elif [ -x /usr/bin/busybox ]; then echo "addgroup -S $ARGUMENTS" /usr/bin/getent group "${arr[1]}" >> /dev/null || /usr/bin/busybox addgroup -S $ARGUMENTS || exit $? + elif [ -x /bin/busybox ]; then + echo "addgroup -S $ARGUMENTS" + /usr/bin/getent group "${arr[1]}" >> /dev/null || /bin/busybox addgroup -S $ARGUMENTS || exit $? else echo "ERROR: neither groupadd nor busybox found!" exit 1 @@ -33,19 +36,34 @@ else ARGUMENTS="-d / $ARGUMENTS" fi - /usr/bin/getent group ${arr[1]} >> /dev/null - if [ $? -eq 0 ]; then - ARGUMENTS="-g ${arr[1]} $ARGUMENTS" - else - ARGUMENTS="-U $ARGUMENTS" - fi if [ -x /usr/sbin/useradd ]; then + # this is useradd/shadow specific + /usr/bin/getent group ${arr[1]} >> /dev/null + if [ $? -eq 0 ]; then + ARGUMENTS="-g ${arr[1]} $ARGUMENTS" + else + ARGUMENTS="-U $ARGUMENTS" + fi echo "useradd -r -s /sbin/nologin -c \"${arr[3]}\" $ARGUMENTS" /usr/bin/getent passwd ${arr[1]} >> /dev/null || /usr/sbin/useradd -r -s /sbin/nologin -c "${arr[3]}" $ARGUMENTS || exit $? elif [ -x /usr/bin/busybox ]; then + /usr/bin/getent group ${arr[1]} >> /dev/null + if [ $? -ne 0 ]; then + /usr/bin/busybox addgroup ${arr[1]} + fi + ARGUMENTS="-G ${arr[1]} $ARGUMENTS" ARGUMENTS=`echo $ARGUMENTS | sed -e 's|-d|-h|g' -e 's|-g|-G|g'` echo "adduser -S -s /sbin/nologin -g \"${arr[3]}\" $ARGUMENTS" /usr/bin/getent passwd ${arr[1]} >> /dev/null || /usr/bin/busybox adduser -S -s /sbin/nologin -g "${arr[3]}" $ARGUMENTS || exit $? + elif [ -x /bin/busybox ]; then + /usr/bin/getent group ${arr[1]} >> /dev/null + if [ $? -ne 0 ]; then + /bin/busybox addgroup ${arr[1]} + fi + ARGUMENTS="-G ${arr[1]} $ARGUMENTS" + ARGUMENTS=`echo $ARGUMENTS | sed -e 's|-d|-h|g' -e 's|-g|-G|g'` + echo "adduser -S -s /sbin/nologin -g \"${arr[3]}\" $ARGUMENTS" + /usr/bin/getent passwd ${arr[1]} >> /dev/null || /bin/busybox adduser -S -s /sbin/nologin -g "${arr[3]}" $ARGUMENTS || exit $? else echo "ERROR: neither useradd nor busybox found!" exit 1 @@ -59,6 +77,9 @@ elif [ -x /usr/bin/busybox ]; then echo "addgroup ${arr[1]} ${arr[2]}" /usr/bin/busybox addgroup ${arr[1]} ${arr[2]} || exit $? + elif [ -x /bin/busybox ]; then + echo "addgroup ${arr[1]} ${arr[2]}" + /bin/busybox addgroup ${arr[1]} ${arr[2]} || exit $? else echo "ERROR: neither usermod nor busybox found!" exit 1
