saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index c87f596a9fb39cf78a34454137562fe93e7c9270..e0567aa1e125f499f5c34b985987d9addb3b2fe2 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1,9 +1,12 @@
 # Generated by etckeeper.  Do not edit.
 
 mkdir -p './ConsoleKit/run-seat.d'
+mkdir -p './NetworkManager/conf.d'
 mkdir -p './NetworkManager/dispatcher.d/no-wait.d'
 mkdir -p './NetworkManager/dispatcher.d/pre-down.d'
 mkdir -p './NetworkManager/dispatcher.d/pre-up.d'
+mkdir -p './NetworkManager/dnsmasq-shared.d'
+mkdir -p './NetworkManager/dnsmasq.d'
 mkdir -p './ca-certificates/update.d'
 mkdir -p './courier-imap/imapaccess'
 mkdir -p './courier-imap/shared'
@@ -81,12 +84,15 @@ maybe chmod 0644 'ImageMagick-6/type-urw-base35.xml'
 maybe chmod 0644 'ImageMagick-6/type-windows.xml'
 maybe chmod 0644 'ImageMagick-6/type.xml'
 maybe chmod 0755 'NetworkManager'
+maybe chmod 0755 'NetworkManager/conf.d'
 maybe chmod 0755 'NetworkManager/dispatcher.d'
 maybe chmod 0644 'NetworkManager/dispatcher.d/.keep_net-misc_networkmanager-0'
 maybe chmod 0755 'NetworkManager/dispatcher.d/10-openrc-status'
 maybe chmod 0755 'NetworkManager/dispatcher.d/no-wait.d'
 maybe chmod 0755 'NetworkManager/dispatcher.d/pre-down.d'
 maybe chmod 0755 'NetworkManager/dispatcher.d/pre-up.d'
+maybe chmod 0755 'NetworkManager/dnsmasq-shared.d'
+maybe chmod 0755 'NetworkManager/dnsmasq.d'
 maybe chmod 0755 'NetworkManager/system-connections'
 maybe chmod 0600 'NetworkManager/system-connections/.keep_net-misc_networkmanager-0'
 maybe chmod 0755 'UPower'

diff --git a/dbus-1/system.d/org.freedesktop.NetworkManager.conf b/dbus-1/system.d/org.freedesktop.NetworkManager.conf
index d130f7e2713931fb3eab1b3188d84695f53c1f57..6be1feb68ecddd882c489737455ee3b3166fffcf 100644 (file)
--- a/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+++ b/dbus-1/system.d/org.freedesktop.NetworkManager.conf
@@ -11,8 +11,8 @@
 
                 <allow send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
                 <!-- 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.
+                     <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"/>
@@ -27,6 +27,8 @@
                 <allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
                 <allow send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
 
+                <allow send_destination="org.fedoraproject.FirewallD1"/>
+
                 <!-- 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.
@@ -39,7 +41,7 @@
 
                 <deny send_destination="org.freedesktop.NetworkManager"/>
 
-               <!-- Basic D-Bus API stuff -->
+                <!-- Basic D-Bus API stuff -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.DBus.Introspectable"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
@@ -47,7 +49,7 @@
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.DBus.ObjectManager"/>
 
-               <!-- Devices (read-only properties, no methods) -->
+                <!-- Devices (read-only properties, no methods) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.Device.Adsl"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
@@ -83,17 +85,17 @@
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.AccessPoint"/>
 
-               <!-- Devices (read-only, no security required) -->
+                <!-- Devices (read-only, no security required) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.Device.WiMax"/>
 
-               <!-- Devices (read/write, secured with PolicyKit) -->
+                <!-- Devices (read/write, secured with PolicyKit) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.Device.Wireless"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.Device"/>
 
-               <!-- Core stuff (read-only properties, no methods) -->
+                <!-- Core stuff (read-only properties, no methods) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
@@ -107,7 +109,7 @@
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
 
-               <!-- Core stuff (read/write, secured with PolicyKit) -->
+                <!-- Core stuff (read/write, secured with PolicyKit) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
@@ -115,13 +117,13 @@
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.Settings.Connection"/>
 
-               <!-- Agents; secured with PolicyKit.  Any process can talk to
-                    the AgentManager API, but only NetworkManager can talk
-                    to the agents themselves. -->
+                <!-- Agents; secured with PolicyKit.  Any process can talk to
+                     the AgentManager API, but only NetworkManager can talk
+                     to the agents themselves. -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.AgentManager"/>
 
-               <!-- Root-only functions -->
+                <!-- Root-only functions -->
                 <deny send_destination="org.freedesktop.NetworkManager"
                       send_interface="org.freedesktop.NetworkManager"
                       send_member="SetLogging"/>
@@ -139,7 +141,7 @@
                 <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>
+        <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 fbb8973b8af9e53cdb6b1dd7533e8163980ae938..3209644c511f434cdcbe1741b199dd7c8b504bbc 100755 (executable)
--- a/init.d/NetworkManager
+++ b/init.d/NetworkManager
@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 # Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
-# Distributed under the terms of the GNU General Purpose License v2
-# $Id$
+# Copyright 2013-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 
 description="NetworkManager daemon. The service is marked as started only \
 when a network connection is established."