diff options
| author | Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br> | 2015-10-16 08:31:40 -0300 |
|---|---|---|
| committer | Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br> | 2015-10-16 08:31:40 -0300 |
| commit | 6c1452e6bc2ac20a14bd882fbb334c9042e4f708 (patch) | |
| tree | 7ff31804404721a50e9f0c18451bac4874778881 | |
| parent | 3bf927c5ed7720de1561e42a7de8790d8de9b6f8 (diff) | |
| download | lightdm-6c1452e6bc2ac20a14bd882fbb334c9042e4f708.tar.gz | |
Replace Debian-specific adduser/deluser commands with their cross-distro couterparts useradd/userdel. Based on Andrew Gunnerson's work (https://github.com/chenxiaolong/Unity-for-Fedora-Extra/blob/master/lightdm-guest-session/guest-session-cross-distro.patch)
| -rw-r--r-- | debian/guest-account.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/debian/guest-account.sh b/debian/guest-account.sh index f4ea2fe2..8380bd3a 100644 --- a/debian/guest-account.sh +++ b/debian/guest-account.sh @@ -48,8 +48,7 @@ add_account () fi else # does not exist, so create it - adduser --system --no-create-home --home / --gecos $(gettext "Guest") --group --shell /bin/bash ${USER} || { - umount ${HOME} + useradd --system --home-dir / --comment $(gettext "Guest") --user-group --shell /bin/bash ${USER} || { rm -rf ${HOME} exit 1 } @@ -134,7 +133,10 @@ remove_account () GUEST_UID=$(echo ${PWENT} | cut -f3 -d:) GUEST_HOME=$(echo ${PWENT} | cut -f6 -d:) - if [ ${GUEST_UID} -ge 500 ]; then + SYS_UID_MIN=$(cat /etc/login.defs | grep SYS_UID_MIN | awk '{print $2}') + SYS_UID_MAX=$(cat /etc/login.defs | grep SYS_UID_MAX | awk '{print $2}') + + if [ ${GUEST_UID} -lt ${SYS_UID_MIN} ] || [ ${GUEST_UID} -gt ${SYS_UID_MAX} ]; then echo "Error: user ${GUEST_USER} is not a system user." exit 1 fi @@ -167,7 +169,7 @@ remove_account () rmdir /media/${GUEST_USER} || true fi - deluser --system ${GUEST_USER} + userdel ${GUEST_USER} } case ${1} in |