From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 5 Oct 2016 16:47:38 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=de8dfe556b66a81c6a78e56cca9f017be47af613;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/conf.d/net b/conf.d/net
index 2f9ea0b8..2f2b1156 100644
--- a/conf.d/net
+++ b/conf.d/net
@@ -1,35 +1,10 @@
-# This blank configuration will automatically use DHCP for any net.*
-# scripts in /etc/init.d.  To create a more complete configuration,
-# please review /usr/share/doc/openrc*/net.example* and save your configuration
-# in /etc/conf.d/net (this file :]!).
-
-#modules_eth1=( "dhcpcd" )
 modules_eth0=( "dhclient" )
-#config_eth1=( "dhcp" )
-#dhcp_eth1="release nodns nontp nonis"
-
-#config_eth0=( "10.12.11.2/24" "2001:6f8:1db7::1/64" )
-#routes_eth0=( "default via 10.12.11.1" );
 
-#config_eth0="10.12.11.2/24 2001:6f8:1db7::1/64"
-config_eth0="10.12.11.2/24 2a02:8109:ae3f:fa04:5604:a6ff:fe38:99f9/64"
-routes_eth0="default via 10.12.11.254
+bridge_br0="eth0"
+config_eth0="null"
+config_br0="10.12.11.2/24 2a02:8109:ae3f:fa04:5604:a6ff:fe38:99f9/64"
+routes_br0="default via 10.12.11.254
 default via 2a02:8109:ae3f:fa04:a96:d7ff:fe55:4821"
-#config_eth0="dhcp"
-#dhcp_eth0="release nodns nontp nonis"
-fallback_eth0="apipa"
-
-#dns_domain_eth0="brehm-online.com"
-#dns_servers_eth0="10.12.11.254"
-#dns_search_eth0="home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de"
-
-#postup() {
-#    if [ "${IFACE}" = "eth0" ] ; then
-#        dhclient -6 eth0
-#    fi
-#}
+brctl_br0="setfd 0
+sethello 10"
 
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/openrc-0.12.4 from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
diff --git a/cups/printers.conf b/cups/printers.conf
index 468545c6..d20aab08 100644
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v2.1.3
-# Written by cupsd on 2016-10-04 16:05
+# Written by cupsd on 2016-10-05 18:13
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer Bla_blub>
 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d
diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 6da55337..5ffbc232 100644
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,20 +1,20 @@
 # Subscription configuration file for CUPS v2.1.3
-# Written by cupsd on 2016-10-04 16:05
-NextSubscriptionId 298
-<Subscription 296>
+# Written by cupsd on 2016-10-05 18:13
+NextSubscriptionId 300
+<Subscription 298>
 Events printer-changed
 Owner root
 LeaseDuration 86400
 Interval 60
-ExpirationTime 1475676297
+ExpirationTime 1475770351
 NextEventId 1
 </Subscription>
-<Subscription 297>
+<Subscription 299>
 Events all
 Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1475676297
+ExpirationTime 1475770351
 NextEventId 1
 </Subscription>
diff --git a/init.d/net.br0 b/init.d/net.br0
new file mode 120000
index 00000000..3843c797
--- /dev/null
+++ b/init.d/net.br0
@@ -0,0 +1 @@
+net.lo
\ No newline at end of file
diff --git a/libvirt/nwfilter/allow-arp.xml b/libvirt/nwfilter/allow-arp.xml
index 63a92b25..fef7891c 100644
--- a/libvirt/nwfilter/allow-arp.xml
+++ b/libvirt/nwfilter/allow-arp.xml
@@ -1,3 +1,11 @@
-<filter name='allow-arp' chain='arp'>
-  <rule direction='inout' action='accept'/>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit allow-arp
+or other application using the libvirt API.
+-->
+
+<filter name='allow-arp' chain='arp' priority='-500'>
+  <uuid>cba5ee05-dfa7-4a27-9c3d-4e18bf826170</uuid>
+  <rule action='accept' direction='inout' priority='500'/>
 </filter>
diff --git a/libvirt/nwfilter/allow-dhcp-server.xml b/libvirt/nwfilter/allow-dhcp-server.xml
index 37e708ed..3bd452bf 100644
--- a/libvirt/nwfilter/allow-dhcp-server.xml
+++ b/libvirt/nwfilter/allow-dhcp-server.xml
@@ -1,24 +1,16 @@
-<filter name='allow-dhcp-server' chain='ipv4'>
-
-    <!-- accept outgoing DHCP requests -->
-    <!-- note, this rule must be evaluated before general MAC broadcast
-         traffic is discarded since DHCP requests use MAC broadcast -->
-    <rule action='accept' direction='out' priority='100'>
-        <ip srcipaddr='0.0.0.0'
-            dstipaddr='255.255.255.255'
-            protocol='udp'
-            srcportstart='68'
-            dstportstart='67' />
-    </rule>
-
-    <!-- accept incoming DHCP responses from a specific DHCP server
-         parameter DHPCSERVER needs to be passed from where this filter is
-         referenced -->
-    <rule action='accept' direction='in' priority='100' >
-        <ip srcipaddr='$DHCPSERVER'
-            protocol='udp'
-            srcportstart='67'
-            dstportstart='68'/>
-    </rule>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit allow-dhcp-server
+or other application using the libvirt API.
+-->
 
+<filter name='allow-dhcp-server' chain='ipv4' priority='-700'>
+  <uuid>7c952b52-7cc4-4f0b-8703-7ce4b08e7025</uuid>
+  <rule action='accept' direction='out' priority='100'>
+    <ip srcipaddr='0.0.0.0' dstipaddr='255.255.255.255' protocol='udp' srcportstart='68' dstportstart='67'/>
+  </rule>
+  <rule action='accept' direction='in' priority='100'>
+    <ip srcipaddr='$DHCPSERVER' protocol='udp' srcportstart='67' dstportstart='68'/>
+  </rule>
 </filter>
diff --git a/libvirt/nwfilter/allow-dhcp.xml b/libvirt/nwfilter/allow-dhcp.xml
index d66d2b66..15dd89dd 100644
--- a/libvirt/nwfilter/allow-dhcp.xml
+++ b/libvirt/nwfilter/allow-dhcp.xml
@@ -1,21 +1,16 @@
-<filter name='allow-dhcp' chain='ipv4'>
-
-    <!-- accept outgoing DHCP requests -->
-    <!-- not, this rule must be evaluated before general MAC broadcast
-         traffic is discarded since DHCP requests use MAC broadcast -->
-    <rule action='accept' direction='out' priority='100'>
-        <ip srcipaddr='0.0.0.0'
-            dstipaddr='255.255.255.255'
-            protocol='udp'
-            srcportstart='68'
-            dstportstart='67' />
-    </rule>
-
-    <!-- accept incoming DHCP responses from any DHCP server -->
-    <rule action='accept' direction='in' priority='100' >
-        <ip protocol='udp'
-            srcportstart='67'
-            dstportstart='68'/>
-    </rule>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit allow-dhcp
+or other application using the libvirt API.
+-->
 
+<filter name='allow-dhcp' chain='ipv4' priority='-700'>
+  <uuid>5462a023-54da-4611-b98e-96aa600c451b</uuid>
+  <rule action='accept' direction='out' priority='100'>
+    <ip srcipaddr='0.0.0.0' dstipaddr='255.255.255.255' protocol='udp' srcportstart='68' dstportstart='67'/>
+  </rule>
+  <rule action='accept' direction='in' priority='100'>
+    <ip protocol='udp' srcportstart='67' dstportstart='68'/>
+  </rule>
 </filter>
diff --git a/libvirt/nwfilter/allow-incoming-ipv4.xml b/libvirt/nwfilter/allow-incoming-ipv4.xml
index dd1e50d0..653fd219 100644
--- a/libvirt/nwfilter/allow-incoming-ipv4.xml
+++ b/libvirt/nwfilter/allow-incoming-ipv4.xml
@@ -1,3 +1,11 @@
-<filter name='allow-incoming-ipv4' chain='ipv4'>
-  <rule direction='in' action='accept'/>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit allow-incoming-ipv4
+or other application using the libvirt API.
+-->
+
+<filter name='allow-incoming-ipv4' chain='ipv4' priority='-700'>
+  <uuid>8cd418be-ad3b-4ac0-87e8-5a49029d4a72</uuid>
+  <rule action='accept' direction='in' priority='500'/>
 </filter>
diff --git a/libvirt/nwfilter/allow-ipv4.xml b/libvirt/nwfilter/allow-ipv4.xml
index 28e930a7..c377e64f 100644
--- a/libvirt/nwfilter/allow-ipv4.xml
+++ b/libvirt/nwfilter/allow-ipv4.xml
@@ -1,3 +1,11 @@
-<filter name='allow-ipv4' chain='ipv4'>
-  <rule direction='inout' action='accept'/>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit allow-ipv4
+or other application using the libvirt API.
+-->
+
+<filter name='allow-ipv4' chain='ipv4' priority='-700'>
+  <uuid>4ec48445-d431-4917-b632-4fbaa50e1707</uuid>
+  <rule action='accept' direction='inout' priority='500'/>
 </filter>
diff --git a/libvirt/nwfilter/clean-traffic.xml b/libvirt/nwfilter/clean-traffic.xml
index b8cde9c5..3455cdb6 100644
--- a/libvirt/nwfilter/clean-traffic.xml
+++ b/libvirt/nwfilter/clean-traffic.xml
@@ -1,30 +1,22 @@
-<filter name='clean-traffic' chain='root'>
-   <!-- An example of a traffic filter enforcing clean traffic
-        from a VM by
-      - preventing MAC spoofing -->
-   <filterref filter='no-mac-spoofing'/>
-
-   <!-- preventing IP spoofing on outgoing, allow all IPv4 in incoming -->
-   <filterref filter='no-ip-spoofing'/>
-
-   <rule direction='out' action='accept' priority='-650'>
-      <mac protocolid='ipv4'/>
-   </rule>
-
-   <filterref filter='allow-incoming-ipv4'/>
-
-   <!-- preventing ARP spoofing/poisoning -->
-   <filterref filter='no-arp-spoofing'/>
-
-   <!-- accept all other incoming and outgoing ARP traffic -->
-   <rule action='accept' direction='inout' priority='-500'>
-      <mac protocolid='arp'/>
-   </rule>
-
-   <!-- preventing any other traffic than IPv4 and ARP -->
-   <filterref filter='no-other-l2-traffic'/>
-
-   <!-- allow qemu to send a self-announce upon migration end -->
-   <filterref filter='qemu-announce-self'/>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit clean-traffic
+or other application using the libvirt API.
+-->
 
+<filter name='clean-traffic' chain='root'>
+  <uuid>65aedbee-e026-4f03-ad32-9d5b8364898b</uuid>
+  <filterref filter='no-mac-spoofing'/>
+  <filterref filter='no-ip-spoofing'/>
+  <rule action='accept' direction='out' priority='-650'>
+    <mac protocolid='ipv4'/>
+  </rule>
+  <filterref filter='allow-incoming-ipv4'/>
+  <filterref filter='no-arp-spoofing'/>
+  <rule action='accept' direction='inout' priority='-500'>
+    <mac protocolid='arp'/>
+  </rule>
+  <filterref filter='no-other-l2-traffic'/>
+  <filterref filter='qemu-announce-self'/>
 </filter>
diff --git a/libvirt/nwfilter/no-arp-ip-spoofing.xml b/libvirt/nwfilter/no-arp-ip-spoofing.xml
index 7365298f..0bf2c976 100644
--- a/libvirt/nwfilter/no-arp-ip-spoofing.xml
+++ b/libvirt/nwfilter/no-arp-ip-spoofing.xml
@@ -1,9 +1,14 @@
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit no-arp-ip-spoofing
+or other application using the libvirt API.
+-->
+
 <filter name='no-arp-ip-spoofing' chain='arp-ip' priority='-510'>
-  <!-- no arp spoofing -->
-  <!-- drop if ipaddr does not belong to guest -->
-  <rule action='return' direction='out' priority='400' >
-    <arp match='yes' arpsrcipaddr='$IP' />
+  <uuid>473cb31d-d866-4693-9a65-4ae26d4a5940</uuid>
+  <rule action='return' direction='out' priority='400'>
+    <arp arpsrcipaddr='$IP'/>
   </rule>
-  <!-- drop everything else -->
-  <rule action='drop' direction='out' priority='1000' />
+  <rule action='drop' direction='out' priority='1000'/>
 </filter>
diff --git a/libvirt/nwfilter/no-arp-mac-spoofing.xml b/libvirt/nwfilter/no-arp-mac-spoofing.xml
index 71482bb5..75eff5e5 100644
--- a/libvirt/nwfilter/no-arp-mac-spoofing.xml
+++ b/libvirt/nwfilter/no-arp-mac-spoofing.xml
@@ -1,7 +1,14 @@
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit no-arp-mac-spoofing
+or other application using the libvirt API.
+-->
+
 <filter name='no-arp-mac-spoofing' chain='arp-mac' priority='-520'>
-   <rule action='return' direction='out' priority='350' >
-      <arp match='yes' arpsrcmacaddr='$MAC'/>
-   </rule>
-   <!-- drop everything else -->
-   <rule action='drop' direction='out' priority='1000' />
+  <uuid>86ef4129-25df-4c34-968f-140e25c72bfb</uuid>
+  <rule action='return' direction='out' priority='350'>
+    <arp arpsrcmacaddr='$MAC'/>
+  </rule>
+  <rule action='drop' direction='out' priority='1000'/>
 </filter>
diff --git a/libvirt/nwfilter/no-arp-spoofing.xml b/libvirt/nwfilter/no-arp-spoofing.xml
index 23f2d3cd..596a6d34 100644
--- a/libvirt/nwfilter/no-arp-spoofing.xml
+++ b/libvirt/nwfilter/no-arp-spoofing.xml
@@ -1,4 +1,12 @@
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit no-arp-spoofing
+or other application using the libvirt API.
+-->
+
 <filter name='no-arp-spoofing' chain='root'>
+  <uuid>58266155-6808-481d-a9d2-483912c8847d</uuid>
   <filterref filter='no-arp-mac-spoofing'/>
   <filterref filter='no-arp-ip-spoofing'/>
 </filter>
diff --git a/libvirt/nwfilter/no-ip-multicast.xml b/libvirt/nwfilter/no-ip-multicast.xml
index edcf03f6..1b6e7cbd 100644
--- a/libvirt/nwfilter/no-ip-multicast.xml
+++ b/libvirt/nwfilter/no-ip-multicast.xml
@@ -1,9 +1,13 @@
-<filter name='no-ip-multicast' chain='ipv4'>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit no-ip-multicast
+or other application using the libvirt API.
+-->
 
-    <!-- drop if destination IP address is in the 224.0.0.0/4 subnet -->
-    <rule action='drop' direction='out'>
-        <ip dstipaddr='224.0.0.0' dstipmask='4' />
-    </rule>
-
-    <!-- not doing anything with receiving side ... -->
+<filter name='no-ip-multicast' chain='ipv4' priority='-700'>
+  <uuid>c5f9e818-0c58-4890-9306-2c74e426f128</uuid>
+  <rule action='drop' direction='out' priority='500'>
+    <ip dstipaddr='224.0.0.0' dstipmask='4'/>
+  </rule>
 </filter>
diff --git a/libvirt/nwfilter/no-ip-spoofing.xml b/libvirt/nwfilter/no-ip-spoofing.xml
index f8c95733..08377b2a 100644
--- a/libvirt/nwfilter/no-ip-spoofing.xml
+++ b/libvirt/nwfilter/no-ip-spoofing.xml
@@ -1,14 +1,17 @@
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit no-ip-spoofing
+or other application using the libvirt API.
+-->
+
 <filter name='no-ip-spoofing' chain='ipv4-ip' priority='-710'>
-  <!-- allow UDP sent from 0.0.0.0 (DHCP); filter more exact later -->
+  <uuid>5b48767b-c7a2-4542-af68-33e1f52da2f3</uuid>
   <rule action='return' direction='out' priority='100'>
     <ip srcipaddr='0.0.0.0' protocol='udp'/>
   </rule>
-
-  <!-- allow all known IP addresses -->
-  <rule direction='out' action='return' priority='500'>
+  <rule action='return' direction='out' priority='500'>
     <ip srcipaddr='$IP'/>
   </rule>
-
-  <!-- drop everything else -->
-  <rule direction='out' action='drop' priority='1000'/>
+  <rule action='drop' direction='out' priority='1000'/>
 </filter>
diff --git a/libvirt/nwfilter/no-mac-broadcast.xml b/libvirt/nwfilter/no-mac-broadcast.xml
index 74e65bf7..1faa4b23 100644
--- a/libvirt/nwfilter/no-mac-broadcast.xml
+++ b/libvirt/nwfilter/no-mac-broadcast.xml
@@ -1,8 +1,13 @@
-<filter name='no-mac-broadcast' chain='ipv4'>
-    <!-- drop if destination mac is bcast mac addr. -->
-    <rule action='drop' direction='out'>
-        <mac dstmacaddr='ff:ff:ff:ff:ff:ff' />
-    </rule>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit no-mac-broadcast
+or other application using the libvirt API.
+-->
 
-    <!-- not doing anything with receiving side ... -->
+<filter name='no-mac-broadcast' chain='ipv4' priority='-700'>
+  <uuid>e13e3fdf-cf39-493b-8fef-63fd732e5e88</uuid>
+  <rule action='drop' direction='out' priority='500'>
+    <mac dstmacaddr='ff:ff:ff:ff:ff:ff'/>
+  </rule>
 </filter>
diff --git a/libvirt/nwfilter/no-mac-spoofing.xml b/libvirt/nwfilter/no-mac-spoofing.xml
index 2d0468ff..eb90e57d 100644
--- a/libvirt/nwfilter/no-mac-spoofing.xml
+++ b/libvirt/nwfilter/no-mac-spoofing.xml
@@ -1,10 +1,16 @@
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit no-mac-spoofing
+or other application using the libvirt API.
+-->
+
 <filter name='no-mac-spoofing' chain='mac' priority='-800'>
-  <!-- return packets with VM's MAC address as source address -->
-  <rule direction='out' action='return'>
+  <uuid>ac0d6631-ea39-4ee9-8004-552ae50ba8ab</uuid>
+  <rule action='return' direction='out' priority='500'>
     <mac srcmacaddr='$MAC'/>
   </rule>
-  <!-- drop everything else -->
-  <rule direction='out' action='drop'>
+  <rule action='drop' direction='out' priority='500'>
     <mac/>
   </rule>
 </filter>
diff --git a/libvirt/nwfilter/no-other-l2-traffic.xml b/libvirt/nwfilter/no-other-l2-traffic.xml
index 8bad86ef..1835e3f9 100644
--- a/libvirt/nwfilter/no-other-l2-traffic.xml
+++ b/libvirt/nwfilter/no-other-l2-traffic.xml
@@ -1,7 +1,11 @@
-<filter name='no-other-l2-traffic'>
-
-    <!-- drop all other l2 traffic than for which rules have been
-         written for; i.e., drop all other than arp and ipv4 traffic -->
-    <rule action='drop' direction='inout' priority='1000'/>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit no-other-l2-traffic
+or other application using the libvirt API.
+-->
 
+<filter name='no-other-l2-traffic' chain='root'>
+  <uuid>c831aa08-e503-4b2a-a6f7-84647ec9a9c6</uuid>
+  <rule action='drop' direction='inout' priority='1000'/>
 </filter>
diff --git a/libvirt/nwfilter/no-other-rarp-traffic.xml b/libvirt/nwfilter/no-other-rarp-traffic.xml
index 7729996e..f9c0c964 100644
--- a/libvirt/nwfilter/no-other-rarp-traffic.xml
+++ b/libvirt/nwfilter/no-other-rarp-traffic.xml
@@ -1,3 +1,11 @@
-<filter name='no-other-rarp-traffic' chain='rarp'>
-    <rule action='drop' direction='inout' priority='1000'/>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit no-other-rarp-traffic
+or other application using the libvirt API.
+-->
+
+<filter name='no-other-rarp-traffic' chain='rarp' priority='-400'>
+  <uuid>15155842-ed37-46e4-8bda-8e0017ea65f2</uuid>
+  <rule action='drop' direction='inout' priority='1000'/>
 </filter>
diff --git a/libvirt/nwfilter/qemu-announce-self-rarp.xml b/libvirt/nwfilter/qemu-announce-self-rarp.xml
index b7a848ad..e1bc04cd 100644
--- a/libvirt/nwfilter/qemu-announce-self-rarp.xml
+++ b/libvirt/nwfilter/qemu-announce-self-rarp.xml
@@ -1,14 +1,16 @@
-<filter name='qemu-announce-self-rarp' chain='rarp'>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit qemu-announce-self-rarp
+or other application using the libvirt API.
+-->
+
+<filter name='qemu-announce-self-rarp' chain='rarp' priority='-400'>
+  <uuid>e24f3768-5db4-418e-a0ed-6f8e8bae55ff</uuid>
   <rule action='accept' direction='out' priority='500'>
-    <rarp opcode='Request_Reverse'
-          srcmacaddr='$MAC' dstmacaddr='ff:ff:ff:ff:ff:ff'
-          arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC'
-          arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/>
+    <rarp srcmacaddr='$MAC' dstmacaddr='ff:ff:ff:ff:ff:ff' opcode='Request_Reverse' arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC' arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/>
   </rule>
   <rule action='accept' direction='in' priority='500'>
-    <rarp opcode='Request_Reverse'
-          dstmacaddr='ff:ff:ff:ff:ff:ff'
-          arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC'
-          arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/>
+    <rarp dstmacaddr='ff:ff:ff:ff:ff:ff' opcode='Request_Reverse' arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC' arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/>
   </rule>
 </filter>
diff --git a/libvirt/nwfilter/qemu-announce-self.xml b/libvirt/nwfilter/qemu-announce-self.xml
index 352db500..7e839655 100644
--- a/libvirt/nwfilter/qemu-announce-self.xml
+++ b/libvirt/nwfilter/qemu-announce-self.xml
@@ -1,13 +1,15 @@
-<filter name='qemu-announce-self' chain='root'>
-    <!-- as of 4/26/2010 qemu sends out a bogus packet with
-         wrong rarp protocol ID -->
-    <!-- accept what is being sent now -->
-    <rule action='accept' direction='out'>
-        <mac protocolid='0x835'/>
-    </rule>
-
-    <!-- accept if it was changed to rarp -->
-    <filterref filter='qemu-announce-self-rarp'/>
-    <filterref filter='no-other-rarp-traffic'/>
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh nwfilter-edit qemu-announce-self
+or other application using the libvirt API.
+-->
 
+<filter name='qemu-announce-self' chain='root'>
+  <uuid>247832ba-d1ba-4cd7-8988-2d5e51575c88</uuid>
+  <rule action='accept' direction='out' priority='500'>
+    <mac protocolid='0x835'/>
+  </rule>
+  <filterref filter='qemu-announce-self-rarp'/>
+  <filterref filter='no-other-rarp-traffic'/>
 </filter>
diff --git a/libvirt/storage/autostart/images.xml b/libvirt/storage/autostart/images.xml
new file mode 120000
index 00000000..5feafd69
--- /dev/null
+++ b/libvirt/storage/autostart/images.xml
@@ -0,0 +1 @@
+/etc/libvirt/storage/images.xml
\ No newline at end of file
diff --git a/libvirt/storage/images.xml b/libvirt/storage/images.xml
new file mode 100644
index 00000000..bf77c3d3
--- /dev/null
+++ b/libvirt/storage/images.xml
@@ -0,0 +1,19 @@
+<!--
+WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
+OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
+  virsh pool-edit images
+or other application using the libvirt API.
+-->
+
+<pool type='dir'>
+  <name>images</name>
+  <uuid>ffb16d34-08fa-42fb-823a-1502a4b1a0b2</uuid>
+  <capacity unit='bytes'>0</capacity>
+  <allocation unit='bytes'>0</allocation>
+  <available unit='bytes'>0</available>
+  <source>
+  </source>
+  <target>
+    <path>/var/lib/images</path>
+  </target>
+</pool>
diff --git a/portage/make.conf b/portage/make.conf
index e2b6375d..550a439b 100644
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -65,7 +65,7 @@ FEATURES="parallel-fetch userpriv usersandbox"
 #FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/"
 
 #LINGUAS="ar bg cs da de el en en_GB en_US es es_ES es_MX fi fr fr_CA fy it ja he hsb hu la nn nn_NO no nds nl oc pl pt pt_BR pt_PT ru sv sv_SE tr uk vi zh_CN zh_HK zh_TW"
-LINGUAS="de en en_GB en_US ru vi"
+LINGUAS="de de_DE en en_GB en_US ru vi"
 L10N="de en en-GB en-US ru vi"
 
 # These are the USE flags that were used in addition to what is provided by the
diff --git a/portage/package.use b/portage/package.use
index 177fffa2..f09b1100 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -28,7 +28,7 @@ app-editors/gedit			-python_targets_python3_3
 #app-editors/vim				vim-pager vim-with-x
 #app-editors/gvim			netbeans
 
-app-emulation/qemu			kvm vde vte
+app-emulation/qemu			kvm snappy spice systemtap usbredir vde virtfs vte xfs
 app-emulation/virtualbox		extensions vnc
 
 # move app-admin/eselect-php app-eselect/eselect-php
diff --git a/runlevels/default/net.br0 b/runlevels/default/net.br0
new file mode 120000
index 00000000..7fdb9995
--- /dev/null
+++ b/runlevels/default/net.br0
@@ -0,0 +1 @@
+/etc/init.d/net.br0
\ No newline at end of file
diff --git a/runlevels/default/net.eth0 b/runlevels/default/net.eth0
deleted file mode 120000
index f1754b47..00000000
--- a/runlevels/default/net.eth0
+++ /dev/null
@@ -1 +0,0 @@
-/etc/init.d/net.eth0
\ No newline at end of file