-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJU0uQnAAoJEIwFIWzgnAk8/RkP/jpxwugpbPGSZwEl6X3P4D7D
 MI7kh6sMatIaqj/+vHok165OVtsxZsQZURvlZ5FSh9YFKPcly+ibnSEV5cUf0RxZ
 n0BytRVHV4ZLzP00uEnYpvsvc22qP4CzeUbbM1t8QA4BncNDkqTrMGDF8ZE6CueA
 DtMXRWCpMUxzIfDMOTYntG1ohet+evY1Ymy4acwfxb0XSzwCzewfe1sUZeIXd9oz
 Mez/ddeBmty37uJUJd233uCrH/lpG3Zpr+1aWziPpZtxm9IyICIDqG2cWG1+KDaa
 KBPFqOHtJ6xylCqARNfzkiPlvnuFP0Ojt8f9dUTK62JBzd4zOczXZlHLhfkVIEOp
 3d5oDNI9c6OTGunUTdz5Yvi2YQ4uKqu3dAGPRyYA4MjsVaRuFqfcMqGT/gJD9ffB
 7tybYAsvGT104cVQXQpiduLMw1Ki7wimzmeD2u4bq9L0mdG2zZ1aFZmIOdP7wf9c
 1ShPLIo5MayQ3qKMSjgi7pF/LMt5+RGUjeoaCPs+6T+dIM1XOkpsbMEwoOxiCTN5
 CssC97h0MFhFI30oluJuHRJMxAro+NTVc+CCVPMX16HKVHzlkwPRDx60mLmtlda8
 hjjoPZ46vlwcaUJPY7YrvKGzsS+LWvbx21FKNADzHz8ySbimqjAff9VUb3dZyC9k
 1upOvyF+jkD+zU+HRZwn
 =zO0z
 -----END PGP SIGNATURE-----

Merge tag 'hw42_62a0b065' into release2

tag for commit 62a0b065ab

# gpg: Signature made Thu Feb  5 04:31:51 2015 CET using RSA key ID E09C093C
# gpg: Good signature from "HW42 (Qubes Signing Key) <hw42-qubes@ipsumj.de>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FC1A C023 76D0 4C68 341F  406F 8C05 216C E09C 093C
This commit is contained in:
Marek Marczykowski-Górecki 2015-02-05 05:13:18 +01:00
commit ca2e837540

View File

@ -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