From 07406f5e8e27608adf101bda58d02e57a711433a Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 28 Aug 2013 16:38:51 +0200
Subject: [PATCH] change NM mangling from admin to sudo group, drop some extra
 env variables we dont need from touch images

---
 debian/changelog                                          | 8 ++++++++
 .../ubuntu-touch/hooks/45-add-adming-group-nm.chroot      | 6 ------
 live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot | 6 ++++++
 live-build/ubuntu-touch/hooks/48-setup-env.chroot         | 4 +---
 4 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100755 live-build/ubuntu-touch/hooks/45-add-adming-group-nm.chroot
 create mode 100755 live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot

diff --git a/debian/changelog b/debian/changelog
index 650f8422..4f855254 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.180) UNRELEASED; urgency=low
+
+  * make sure the NM configuration mangling of touch images uses the sudo and
+    not the admin group, "admin" is dead since years ... (LP: #1217596)
+  * drop a few superfluous env vars on request of Ted Gould
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 28 Aug 2013 16:27:12 +0200
+
 livecd-rootfs (2.179) saucy; urgency=low
 
   * add 70-reconfigure-autopilot.chroot to ubuntu-touch builds, to make sure
diff --git a/live-build/ubuntu-touch/hooks/45-add-adming-group-nm.chroot b/live-build/ubuntu-touch/hooks/45-add-adming-group-nm.chroot
deleted file mode 100755
index 2b1bb793..00000000
--- a/live-build/ubuntu-touch/hooks/45-add-adming-group-nm.chroot
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-echo "Adding admin group policy to NM system service"
-
-sed -i 's/<policy user="root">/<policy group="admin">\n\t\t\t\t<allow send_destination="org.freedesktop.NetworkManager"\/>\n\t\t\t\t<allow send_interface="org.freedesktop.NetworkManager"\/>\n\t\t\t\t<allow send_interface="org.freedesktop.NetworkManager.SecretAgent"\/>\n\t\t<\/policy>\n\t\t<policy user="root">/g' /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
-
diff --git a/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot b/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot
new file mode 100755
index 00000000..e8779bfe
--- /dev/null
+++ b/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "Adding admin group policy to NM system service"
+
+sed -i 's/<policy user="root">/<policy group="sudo">\n\t\t\t\t<allow send_destination="org.freedesktop.NetworkManager"\/>\n\t\t\t\t<allow send_interface="org.freedesktop.NetworkManager"\/>\n\t\t\t\t<allow send_interface="org.freedesktop.NetworkManager.SecretAgent"\/>\n\t\t<\/policy>\n\t\t<policy user="root">/g' /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+
diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot
index 0ab0c9fe..ed7e06c4 100755
--- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot
+++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot
@@ -23,6 +23,4 @@ ANDROID_ROOT=/system
 EXTERNAL_STORAGE=/mnt/sdcard
 LANG=en_US.UTF-8
 LANGUAGE=en_US:en
-QT_IM_MODULE=maliitphablet
-HUD_NO_STORE_USAGE_DATA=1
-INDICATOR_ALLOW_NO_WATCHERS=1" > /etc/environment
+QT_IM_MODULE=maliitphablet" > /etc/environment