Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/167'

Browse Source 
* origin/pr/167:
  use long options rather than short options
This commit is contained in:
Marek Marczykowski-Górecki 2019-08-02 02:37:36 +02:00
commit c400f50eee
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/qubes-core-agent.preinst vendored
View File

@ -47,9 +47,9 @@ if [ "$1" = "install" ] ; then
useradd --user-group --create-home --shell /bin/bash user
}
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?
@ -72,7 +72,7 @@ if [ "$1" = "upgrade" ] ; then
## Allow passwordless login for user "user" (when using 'sudo xl console').
## https://github.com/QubesOS/qubes-issues/issues/1130
if grep -q '^user:\!:' /etc/shadow ; then
passwd user -d >/dev/null || true
passwd user --delete >/dev/null || true
fi
fi