saving uncommitted changes in /etc prior to emerge run

diff --git a/init.d/dhcpd b/init.d/dhcpd
index f38e5ed393fff755d7047986b0e5ea5659ebdb85..73de3d5c1e37280da22bb921a735aa68bcba227b 100755 (executable)
--- a/init.d/dhcpd
+++ b/init.d/dhcpd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_commands="configtest"
 

diff --git a/init.d/dhcrelay b/init.d/dhcrelay
index eaf3af611ba164a3a711846456bfe6b6ddfbac79..c557501fb4a32dc9eed40acb1121d4817dc75d2a 100755 (executable)
--- a/init.d/dhcrelay
+++ b/init.d/dhcrelay
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
        need net

diff --git a/init.d/dhcrelay6 b/init.d/dhcrelay6
index eaf3af611ba164a3a711846456bfe6b6ddfbac79..c557501fb4a32dc9eed40acb1121d4817dc75d2a 100755 (executable)
--- a/init.d/dhcrelay6
+++ b/init.d/dhcrelay6
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
        need net

diff --git a/openldap/schema/dhcp.schema b/openldap/schema/dhcp.schema
index 0c24a7a2bd4b548a7c801d5c48e33ed288964b0b..378243ecbdf8cc4577e0c02dcdb691629de19caa 100644 (file)
--- a/openldap/schema/dhcp.schema
+++ b/openldap/schema/dhcp.schema
@@ -484,5 +484,5 @@ objectclass ( 2.16.840.1.113719.1.203.6.18
     SUP top
     MUST ( cn $ dhcpRange6 )
     MAY ( dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $dhcpKeyDN $ dhcpStatements $ dhcpComments $ dhcpOption )
-    X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') )
+    X-NDS_CONTAINMENT ('dhcpSubnet6' 'dhcpSharedNetwork') )