saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 6cdcc27294eb7dab4c6c54f0c662a0110c84568e..2f075a90dde3ac6b72164406562387171dc29cfc 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -344,6 +344,7 @@ maybe chmod 0755 'etckeeper/update-ignore.d/01update-ignore'
 maybe chmod 0644 'etckeeper/update-ignore.d/README'
 maybe chmod 0755 'etckeeper/vcs.d'
 maybe chmod 0755 'etckeeper/vcs.d/50vcs-cmd'
+maybe chmod 0644 'ethertypes'
 maybe chmod 0644 'filesystems'
 maybe chmod 0755 'fonts'
 maybe chmod 0755 'fonts/conf.avail'

diff --git a/ethertypes b/ethertypes
new file mode 100644 (file)
index 0000000..813177b
--- /dev/null
+++ b/ethertypes
@@ -0,0 +1,39 @@
+#
+# Ethernet frame types
+#              This file describes some of the various Ethernet
+#              protocol types that are used on Ethernet networks.
+#
+# This list could be found on:
+#         http://www.iana.org/assignments/ethernet-numbers
+#         http://www.iana.org/assignments/ieee-802-numbers
+#
+# <name>    <hexnumber> <alias1>...<alias35> #Comment
+#
+IPv4           0800    ip ip4          # Internet IP (IPv4)
+X25            0805
+ARP            0806    ether-arp       #
+FR_ARP         0808                    # Frame Relay ARP        [RFC1701]
+BPQ            08FF                    # G8BPQ AX.25 Ethernet Packet
+DEC            6000                    # DEC Assigned proto
+DNA_DL         6001                    # DEC DNA Dump/Load
+DNA_RC         6002                    # DEC DNA Remote Console
+DNA_RT         6003                    # DEC DNA Routing
+LAT            6004                    # DEC LAT
+DIAG           6005                    # DEC Diagnostics
+CUST           6006                    # DEC Customer use
+SCA            6007                    # DEC Systems Comms Arch
+TEB            6558                    # Trans Ether Bridging   [RFC1701]
+RAW_FR         6559                    # Raw Frame Relay        [RFC1701]
+RARP           8035                    # Reverse ARP            [RFC903]
+AARP           80F3                    # Appletalk AARP
+ATALK          809B                    # Appletalk
+802_1Q         8100    8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame
+IPX            8137                    # Novell IPX
+NetBEUI                8191                    # NetBEUI
+IPv6           86DD    ip6             # IP version 6
+PPP            880B                    # PPP
+ATMMPOA                884C                    # MultiProtocol over ATM
+PPP_DISC       8863                    # PPPoE discovery messages
+PPP_SES                8864                    # PPPoE session messages
+ATMFATE                8884                    # Frame-based ATM Transport over Ethernet
+LOOP           9000    loopback        # loop proto

diff --git a/init.d/ip6tables b/init.d/ip6tables
index 56d2a701d40e2cadb3ec9140a397507d9400c316..10394c6f09cfc03069e5b5f9393bb30b14352490 100755 (executable)
--- a/init.d/ip6tables
+++ b/init.d/ip6tables
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_commands="check save panic"
 extra_started_commands="reload"
@@ -35,7 +34,7 @@ set_table_policy() {
        esac
        local chain
        for chain in ${chains} ; do
-               ${iptables_bin} -t ${table} -P ${chain} ${policy}
+               ${iptables_bin} -w -t ${table} -P ${chain} ${policy}
        done
 }
 
@@ -73,8 +72,8 @@ stop() {
        for a in $(cat ${iptables_proc}) ; do
                set_table_policy $a ACCEPT
 
-               ${iptables_bin} -F -t $a
-               ${iptables_bin} -X -t $a
+               ${iptables_bin} -w -F -t $a
+               ${iptables_bin} -w -X -t $a
        done
        eend $?
 }
@@ -85,8 +84,8 @@ reload() {
        ebegin "Flushing firewall"
        local a
        for a in $(cat ${iptables_proc}) ; do
-               ${iptables_bin} -F -t $a
-               ${iptables_bin} -X -t $a
+               ${iptables_bin} -w -F -t $a
+               ${iptables_bin} -w -X -t $a
        done
        eend $?
 
@@ -121,8 +120,8 @@ panic() {
        local a
        ebegin "Dropping all packets"
        for a in $(cat ${iptables_proc}) ; do
-               ${iptables_bin} -F -t $a
-               ${iptables_bin} -X -t $a
+               ${iptables_bin} -w -F -t $a
+               ${iptables_bin} -w -X -t $a
 
                set_table_policy $a DROP
        done

diff --git a/init.d/iptables b/init.d/iptables
index 56d2a701d40e2cadb3ec9140a397507d9400c316..10394c6f09cfc03069e5b5f9393bb30b14352490 100755 (executable)
--- a/init.d/iptables
+++ b/init.d/iptables
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_commands="check save panic"
 extra_started_commands="reload"
@@ -35,7 +34,7 @@ set_table_policy() {
        esac
        local chain
        for chain in ${chains} ; do
-               ${iptables_bin} -t ${table} -P ${chain} ${policy}
+               ${iptables_bin} -w -t ${table} -P ${chain} ${policy}
        done
 }
 
@@ -73,8 +72,8 @@ stop() {
        for a in $(cat ${iptables_proc}) ; do
                set_table_policy $a ACCEPT
 
-               ${iptables_bin} -F -t $a
-               ${iptables_bin} -X -t $a
+               ${iptables_bin} -w -F -t $a
+               ${iptables_bin} -w -X -t $a
        done
        eend $?
 }
@@ -85,8 +84,8 @@ reload() {
        ebegin "Flushing firewall"
        local a
        for a in $(cat ${iptables_proc}) ; do
-               ${iptables_bin} -F -t $a
-               ${iptables_bin} -X -t $a
+               ${iptables_bin} -w -F -t $a
+               ${iptables_bin} -w -X -t $a
        done
        eend $?
 
@@ -121,8 +120,8 @@ panic() {
        local a
        ebegin "Dropping all packets"
        for a in $(cat ${iptables_proc}) ; do
-               ${iptables_bin} -F -t $a
-               ${iptables_bin} -X -t $a
+               ${iptables_bin} -w -F -t $a
+               ${iptables_bin} -w -X -t $a
 
                set_table_policy $a DROP
        done