saving uncommitted changes in /etc prior to emerge run

diff --git a/avahi/avahi-autoipd.action b/avahi/avahi-autoipd.action
index c2db9942c32c191c665c6e7c7d0be287ea0a0967..66dbb3318289ac8d4a925a3f028d6d717ec32584 100755 (executable)
--- a/avahi/avahi-autoipd.action
+++ b/avahi/avahi-autoipd.action
@@ -41,6 +41,7 @@ if [ -x /bin/ip -o -x /sbin/ip ] ; then
 
     case "$1" in
         BIND)
+            ip addr flush dev "$2" label "$2:avahi"
             ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
             ip route add default dev "$2" metric "$METRIC" scope link ||:
             ;;

diff --git a/avahi/avahi-daemon.conf b/avahi/avahi-daemon.conf
index 95166f80226bf8de68c1cdb2596402fddeb2f0d6..ff9a4c5832eab1325cc2c2eb4c9ca119753d11ec 100644 (file)
--- a/avahi/avahi-daemon.conf
+++ b/avahi/avahi-daemon.conf
@@ -60,9 +60,9 @@ publish-workstation=no
 
 [rlimits]
 #rlimit-as=
-rlimit-core=0
-rlimit-data=4194304
-rlimit-fsize=0
-rlimit-nofile=768
-rlimit-stack=4194304
-rlimit-nproc=3
+#rlimit-core=0
+#rlimit-data=8388608
+#rlimit-fsize=0
+#rlimit-nofile=768
+#rlimit-stack=8388608
+#rlimit-nproc=3

diff --git a/init.d/avahi-daemon b/init.d/avahi-daemon
index 257116e910e176becb0284494ae1c911ee314b1e..ae61d6ef8d2a57d40f5246282dcbfe6b416c1a5f 100755 (executable)
--- a/init.d/avahi-daemon
+++ b/init.d/avahi-daemon
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="reload"

diff --git a/init.d/avahi-dnsconfd b/init.d/avahi-dnsconfd
index daf36c8b758bdbd04d88e24c02326d119d350052..471840503c6ff785aa9205b7e596566a7fe77bf1 100755 (executable)
--- a/init.d/avahi-dnsconfd
+++ b/init.d/avahi-dnsconfd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="reload"