Ver código fonte

debian: preinst: cleanup user creation

Generate user-groups via -U instead of explicit via groupadd. This also
fix the problem that the tinyproxy group were not gererated as
"system"-group.

Also suppress unneeded output of the existence test.
HW42 9 anos atrás
pai
commit
97dd21bcff
1 arquivos alterados com 4 adições e 6 exclusões
  1. 4 6
      debian/qubes-core-agent.preinst

+ 4 - 6
debian/qubes-core-agent.preinst

@@ -49,13 +49,11 @@ if [ "$1" = "install" ] ; then
     # --------------------------------------------------------------------------
     # User add / modifications
     # --------------------------------------------------------------------------
-    id -u 'user' || {
-        groupadd -f user
-        useradd -g user -G dialout,cdrom,floppy,sudo,audio,dip,video,plugdev -m -s /bin/bash user
+    id -u 'user' >/dev/null 2>&1 || {
+        useradd -U -G dialout,cdrom,floppy,sudo,audio,dip,video,plugdev -m -s /bin/bash user
     }
-    id -u 'tinyproxy' || {
-        groupadd -f tinyproxy
-        useradd -g tinyproxy -r -M --home /run/tinyproxy --shell /bin/false tinyproxy
+    id -u 'tinyproxy' >/dev/null 2>&1 || {
+        useradd -U -r -M --home /run/tinyproxy --shell /bin/false tinyproxy
     }
     usermod -p '' root
     usermod -L user