use long options rather than short options

https://github.com/QubesOS/qubes-issues/issues/1130
This commit is contained in:
Patrick Schleizer 2019-07-14 08:07:21 +00:00 committed by GitHub
parent da3c22b4a6
commit f1add4c506
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -47,9 +47,9 @@ if [ "$1" = "install" ] ; then
useradd --user-group --create-home --shell /bin/bash user useradd --user-group --create-home --shell /bin/bash user
} }
id -u 'tinyproxy' >/dev/null 2>&1 || { id -u 'tinyproxy' >/dev/null 2>&1 || {
useradd --user-group --system -M --home /run/tinyproxy --shell /bin/false tinyproxy useradd --user-group --system --no-create-home --home /run/tinyproxy --shell /bin/false tinyproxy
} }
usermod -L -a --groups qubes user usermod --lock --append --groups qubes user
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Remove `mesg` from root/.profile? # Remove `mesg` from root/.profile?
@ -72,7 +72,7 @@ if [ "$1" = "upgrade" ] ; then
## Allow passwordless login for user "user" (when using 'sudo xl console'). ## Allow passwordless login for user "user" (when using 'sudo xl console').
## https://github.com/QubesOS/qubes-issues/issues/1130 ## https://github.com/QubesOS/qubes-issues/issues/1130
if grep -q '^user:\!:' /etc/shadow ; then if grep -q '^user:\!:' /etc/shadow ; then
passwd user -d >/dev/null || true passwd user --delete >/dev/null || true
fi fi
fi fi