r22793 - in /desktop/experimental/sabayon/debian: changelog sabayon.postinst sabayon.postrm

[dktrkranz at users.alioth.debian.org]

Author: dktrkranz
Date: Thu Jan 14 19:55:33 2010
New Revision: 22793

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22793
Log:
Invoke adduser to create a system user/group (Closes: #487966)

Modified:
    desktop/experimental/sabayon/debian/changelog
    desktop/experimental/sabayon/debian/sabayon.postinst
    desktop/experimental/sabayon/debian/sabayon.postrm

Modified: desktop/experimental/sabayon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/sabayon/debian/changelog?rev=22793&op=diff
==============================================================================
--- desktop/experimental/sabayon/debian/changelog [utf-8] (original)
+++ desktop/experimental/sabayon/debian/changelog [utf-8] Thu Jan 14 19:55:33 2010
@@ -5,8 +5,10 @@
     - Depend on pessulus, upstream no longer ship embedded copy of it.
   * debian/copyright:
     - Adjust copyright holders.
-
- -- Luca Falavigna <dktrkranz at debian.org>  Thu, 14 Jan 2010 20:38:49 +0100
+  * debian/post{inst,rm}:
+    - Invoke adduser to create a system user/group (Closes: #487966).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 14 Jan 2010 20:53:53 +0100
 
 sabayon (2.28.1-1) experimental; urgency=low
 

Modified: desktop/experimental/sabayon/debian/sabayon.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/sabayon/debian/sabayon.postinst?rev=22793&op=diff
==============================================================================
--- desktop/experimental/sabayon/debian/sabayon.postinst [utf-8] (original)
+++ desktop/experimental/sabayon/debian/sabayon.postinst [utf-8] Thu Jan 14 19:55:33 2010
@@ -3,15 +3,10 @@
 set -e
 
 if [ "$1" = "configure" ] ; then
-    if ! getent group sabayon-admin >/dev/null; then
-        groupadd sabayon-admin
-    fi
-
-    if ! getent passwd sabayon-admin >/dev/null; then
-        useradd --home /var/run/sabayon-admin \
-            -c "Sabayon user" --gid sabayon-admin sabayon-admin
-        mkdir -p /var/run/sabayon-admin
-        chown sabayon-admin:sabayon-admin /var/run/sabayon-admin
+    if [ -x /usr/sbin/adduser ] ; then
+        if ! id sabayon-admin >/dev/null 2>&1; then
+            adduser --system --group --home /var/run/sabayon-admin sabayon-admin
+        fi
     fi
 fi
 

Modified: desktop/experimental/sabayon/debian/sabayon.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/sabayon/debian/sabayon.postrm?rev=22793&op=diff
==============================================================================
--- desktop/experimental/sabayon/debian/sabayon.postrm [utf-8] (original)
+++ desktop/experimental/sabayon/debian/sabayon.postrm [utf-8] Thu Jan 14 19:55:33 2010
@@ -3,8 +3,9 @@
 set -e
 
 if [ "$1" = "purge" ] ; then
-    if [ -x /usr/sbin/userdel ] ; then
-        userdel -r sabayon-admin || true
+    if [ -x /usr/sbin/deluser ] ; then
+        deluser --remove-home --remove-all-files sabayon-admin
+        deluser --group sabayon-admin
     fi
 fi