change NM mangling from admin to sudo group, drop some extra env variables we dont need from touch images

ubuntu/trusty
Oliver Grawert 12 years ago
parent 4fc7a2e78e
commit 07406f5e8e

8
debian/changelog vendored

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

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

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

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

Loading…
Cancel
Save