From 1e86459dd54fd032aa19ed9e1abbafd7af70acd4 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Sat, 21 Sep 2013 12:54:02 +0200 Subject: [PATCH] Import patches-unapplied version 2.188 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 14be87dbfd21bf7bb019b35132405904a9a655fa New changelog entries: * ship policykit rules for networkmanager, now that we use it on touch --- debian/changelog | 6 ++++++ .../ubuntu-touch/hooks/45-add-sudo-group-nm.chroot | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index 138930ae..9db4bced 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.188) saucy; urgency=low + + * ship policykit rules for networkmanager, now that we use it on touch + + -- Oliver Grawert Sat, 21 Sep 2013 12:54:02 +0200 + livecd-rootfs (2.187) saucy; urgency=low * Removing QPA_PLATFORM_PLUGIN as it is now handled in their proper 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 index e8779bfe..66d45396 100755 --- a/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot +++ b/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot @@ -4,3 +4,12 @@ echo "Adding admin group policy to NM system service" sed -i 's//\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t<\/policy>\n\t\t/g' /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf +mkdir -p /etc/polkit-1/localauthority/50-local.d +cat > /etc/polkit-1/localauthority/50-local.d/org.freedesktop.NetworkManager.pkla << EOF +[indicator-network-service] +Identity=unix-group:sudo +Action=org.freedesktop.NetworkManager.* +ResultAny=yes +ResultInactive=no +ResultActive=yes +EOF