saving uncommitted changes in /etc prior to emerge run

diff --git a/dbus-1/system.d/org.freedesktop.NetworkManager.conf b/dbus-1/system.d/org.freedesktop.NetworkManager.conf
index 10c6184e4886915e912f3d6992f93e5542667f7e..d130f7e2713931fb3eab1b3188d84695f53c1f57 100644 (file)
--- a/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+++ b/dbus-1/system.d/org.freedesktop.NetworkManager.conf
@@ -10,13 +10,9 @@
                        send_interface="org.freedesktop.NetworkManager.PPP"/>
 
                 <allow send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
-
-                <!-- Allow NM to talk to known VPN plugins; due to a bug in
-                     the D-Bus daemon, when a plugin is installed and the user
-                     immediately tries to use it, the VPN plugin's rules aren't
-                     always loaded into dbus-daemon.  Those rules allow NM to
-                     talk to the plugin.  Oops.  Work around that by explicitly
-                     allowing NM to talk to VPN plugins here.
+                <!-- These are there because some broken policies do
+                    <deny send_interface="..." /> (see dbus-daemon(8) for details).
+                    This seems to override that for the known VPN plugins.
                   -->
                 <allow send_destination="org.freedesktop.NetworkManager.openconnect"/>
                 <allow send_destination="org.freedesktop.NetworkManager.openswan"/>
@@ -29,6 +25,14 @@
                 <allow send_destination="org.freedesktop.NetworkManager.libreswan"/>
                 <allow send_destination="org.freedesktop.NetworkManager.fortisslvpn"/>
                 <allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
+                <allow send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
+
+                <!-- Allow the custom name for the dnsmasq instance spawned by NM
+                     from the dns dnsmasq plugin to own it's dbus name, and for
+                     messages to be sent to it.
+                 -->
+                <allow own="org.freedesktop.NetworkManager.dnsmasq"/>
+                <allow send_destination="org.freedesktop.NetworkManager.dnsmasq"/>
         </policy>
         <policy context="default">
                 <deny own="org.freedesktop.NetworkManager"/>
@@ -40,6 +44,8 @@
                        send_interface="org.freedesktop.DBus.Introspectable"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.DBus.Properties"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.DBus.ObjectManager"/>
 
                <!-- Devices (read-only properties, no methods) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
@@ -114,17 +120,26 @@
                     to the agents themselves. -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.AgentManager"/>
-                <deny send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
 
                <!-- Root-only functions -->
-                <deny send_interface="org.freedesktop.NetworkManager" send_member="SetLogging"/>
-                <deny send_interface="org.freedesktop.NetworkManager" send_member="Sleep"/>
-                <deny send_interface="org.freedesktop.NetworkManager.Settings" send_member="LoadConnections"/>
-                <deny send_interface="org.freedesktop.NetworkManager.Settings" send_member="ReloadConnections"/>
-                <deny send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
-                <deny send_interface="org.freedesktop.NetworkManager.PPP"/>
+                <deny send_destination="org.freedesktop.NetworkManager"
+                      send_interface="org.freedesktop.NetworkManager"
+                      send_member="SetLogging"/>
+                <deny send_destination="org.freedesktop.NetworkManager"
+                      send_interface="org.freedesktop.NetworkManager"
+                      send_member="Sleep"/>
+                <deny send_destination="org.freedesktop.NetworkManager"
+                      send_interface="org.freedesktop.NetworkManager.Settings"
+                      send_member="LoadConnections"/>
+                <deny send_destination="org.freedesktop.NetworkManager"
+                      send_interface="org.freedesktop.NetworkManager.Settings"
+                      send_member="ReloadConnections"/>
+
+                <deny own="org.freedesktop.NetworkManager.dnsmasq"/>
+                <deny send_destination="org.freedesktop.NetworkManager.dnsmasq"/>
         </policy>
 
        <limit name="max_replies_per_connection">1024</limit>
+       <limit name="max_match_rules_per_connection">2048</limit>
 </busconfig>
 

diff --git a/init.d/NetworkManager b/init.d/NetworkManager
index bd828b78dfd2c14e807fcfc002a8b7f6eae5fe04..779c0eba514216b6496f10d20e8fe4272f305efa 100755 (executable)
--- a/init.d/NetworkManager
+++ b/init.d/NetworkManager
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
 # Distributed under the terms of the GNU General Purpose License v2
 # $Id$