From 699ed3f6a116028ae44accb91b3058f542556e3e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Wed, 5 Jun 2013 13:12:26 +0100
Subject: [PATCH] live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot:
 Delete redundant code to create global static groups, which are already
 created more correctly by base-passwd on every Ubuntu system.

---
 debian/changelog                              |  8 +++
 .../hooks/02-add_user_to_groups.chroot        | 49 -------------------
 2 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0613f11..d552ccd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.148) UNRELEASED; urgency=low
+
+  * live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Delete
+    redundant code to create global static groups, which are already created
+    more correctly by base-passwd on every Ubuntu system.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 05 Jun 2013 13:11:34 +0100
+
 livecd-rootfs (2.147) saucy; urgency=low
 
   * sync ubuntu-touch customzation scripts with phablet build tree 
diff --git a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
index 4c055b3d..1b84bb04 100755
--- a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
+++ b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
@@ -11,34 +11,6 @@ else
    echo "User admin does not exists in /etc/group must create"
    groupadd admin
 fi
-/bin/egrep  -i "^tty" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User tty exists in /etc/group"
-else
-   echo "User tty does not exists in /etc/group must create"
-   groupadd tty
-fi
-/bin/egrep  -i "^dialout" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User dialout exists in /etc/group"
-else
-   echo "User dialout does not exists in /etc/group must create"
-   groupadd dialout
-fi
-/bin/egrep  -i "^cdrom" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User cdrom exists in /etc/group"
-else
-   echo "User cdrom does not exists in /etc/group must create"
-   groupadd cdrom 
-fi
-/bin/egrep  -i "^plugdev" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User plugdev exists in /etc/group"
-else
-   echo "User plugdev does not exists in /etc/group must create"
-   groupadd plugdev
-fi
 /bin/egrep  -i "^audio" /etc/group
 if [ $? -eq 0 ]; then
    # Needed to change group id as audio is already created by ubuntu
@@ -48,27 +20,6 @@ else
    echo "User audio does not exists in /etc/group must create"
    groupadd -g 1005 audio
 fi
-/bin/egrep  -i "^dip" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User dip exists in /etc/group"
-else
-   echo "User dip does not exists in /etc/group must create"
-   groupadd dip
-fi
-/bin/egrep  -i "^video" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User video exists in /etc/group"
-else
-   echo "User video does not exists in /etc/group must create"
-   groupadd video
-fi
-/bin/egrep  -i "^adm" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User adm exists in /etc/group"
-else
-   echo "User adm does not exists in /etc/group must create"
-   groupadd adm
-fi
 /bin/egrep  -i "^gps" /etc/group
 if [ $? -eq 0 ]; then
    echo "User gps exists in /etc/group"