mirror of
git://slackware.nl/current.git
synced 2024-11-16 07:48:02 +01:00
6a20480259
a/aaa_libraries-15.1-x86_64-26.txz: Rebuilt. Upgraded: libacl.so.1.1.2302, libattr.so.1.1.2502, liblzma.so.5.4.6, libpcre2-8.so.0.12.0, libz.so.1.3.1, libcares.so.2.11.0, libexpat.so.1.9.0, libffi.so.8.1.4, libglib-2.0.so.0.7800.4, libgmodule-2.0.so.0.7800.4, libgobject-2.0.so.0.7800.4, libgthread-2.0.so.0.7800.4, libidn.so.12.6.5, libidn2.so.0.4.0, libpng16.so.16.41.0, libpsl.so.5.3.5, libtdb.so.1.4.10, libusb-1.0.so.0.4.0. a/etc-15.1-x86_64-5.txz: Rebuilt. Added UID 214 and GID 214 for avahi. a/gettext-0.22.5-x86_64-1.txz: Upgraded. a/pkgtools-15.1-noarch-9.txz: Rebuilt. setup.services: support rc.avahidaemon and rc.avahidnsconfd. a/sysvinit-scripts-15.1-noarch-13.txz: Rebuilt. rc.M: start (if executable) rc.avahidaemon and rc.avahidnsconfd. ap/cups-2.4.7-x86_64-2.txz: Rebuilt. Recompiled against avahi. ap/cups-filters-1.28.17-x86_64-4.txz: Rebuilt. Recompiled against avahi. ap/hplip-3.23.12-x86_64-1.txz: Upgraded. Compiled against avahi. ap/xmltoman-0.6-x86_64-1.txz: Added. This is needed to generate manpages for avahi. d/distcc-3.4-x86_64-4.txz: Rebuilt. Recompiled against avahi. d/gettext-tools-0.22.5-x86_64-1.txz: Upgraded. l/avahi-20240220_dffd549-x86_64-1.txz: Added. It was either this, or drop (or fork) hplip. We'll enjoy it in the long run. Thanks to David Somero for the original build script, and to Robby Workman for years of maintenance. Signed-off-by: volkerdi Acked-by: alienBOB l/libdaemon-0.14-x86_64-1.txz: Added. This is needed by avahi. l/pipewire-1.0.3-x86_64-5.txz: Rebuilt. Recompiled against avahi. l/pulseaudio-17.0-x86_64-3.txz: Rebuilt. Recompiled against avahi. n/NetworkManager-1.46.0-x86_64-1.txz: Upgraded. n/netatalk-3.1.18-x86_64-2.txz: Rebuilt. Recompiled against avahi. n/samba-4.19.5-x86_64-2.txz: Rebuilt. Recompiled against avahi. xap/pidgin-2.14.12-x86_64-3.txz: Rebuilt. Recompiled against avahi. xap/sane-1.2.1-x86_64-3.txz: Rebuilt. Recompiled against avahi. extra/bash-completion/bash-completion-2.12.0-noarch-1.txz: Upgraded.
69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
avahi-dnsconfd.action looks for /sbin/netconfig, and if found, attempts to
|
|
use it to modify /etc/resolv.conf. While *our* netconfig and SuSE's
|
|
netconfig started out the same, they're quite different these days, and
|
|
thus the result is /etc/HOSTNAME getting set to some nonsense such as:
|
|
INTERFACE='eth0'.DNSSERVERS='192.168.13.1'
|
|
This was quite some fun tracking down, by the way... :-) --rworkman
|
|
|
|
|
|
diff -Nur avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action
|
|
--- avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action 2010-06-28 22:30:34.000000000 -0500
|
|
+++ avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action 2012-01-21 16:18:24.337986754 -0600
|
|
@@ -33,48 +33,16 @@
|
|
# $AVAHI_INTERFACE_DNS_SERVERS A whitespace seperated list of DNS servers on $AVAHI_INTERFACE
|
|
# $AVAHI_DNS_SERVERS The complete list of all DNS servers found on all interfaces
|
|
|
|
-if [ -x /sbin/netconfig ]; then
|
|
- # SUSE method on 11.1+
|
|
- if [ -n "$AVAHI_INTERFACE_DNS_SERVERS" ]; then
|
|
- /sbin/netconfig modify -s avahi -i "$AVAHI_INTERFACE" <<-EOF
|
|
- INTERFACE='$AVAHI_INTERFACE'
|
|
- DNSSERVERS='$AVAHI_INTERFACE_DNS_SERVERS'
|
|
- EOF
|
|
- else
|
|
- /sbin/netconfig remove -s avahi -i "$AVAHI_INTERFACE"
|
|
- fi
|
|
-elif [ -x /sbin/modify_resolvconf ] ; then
|
|
- # method for SUSE <= 11.0
|
|
- if [ -n "$AVAHI_DNS_SERVERS" ]; then
|
|
- /sbin/modify_resolvconf modify -s avahi -t - -p avahi-dnsconfd -n "$AVAHI_DNS_SERVERS" <<-EOF
|
|
- if you don't like avahi to update your Nameservers
|
|
- disable the avahi-dnsconfd init script
|
|
- EOF
|
|
- else
|
|
- /sbin/modify_resolvconf restore -s avahi
|
|
- fi
|
|
-elif [ -x /sbin/resolvconf ] ; then
|
|
|
|
- # We have Debian's resolvconf tool
|
|
-
|
|
- if [ "x$AVAHI_INTERFACE_DNS_SERVERS" = "x" ] ; then
|
|
- /sbin/resolvconf -d "$AVAHI_INTERFACE.avahi"
|
|
- else
|
|
- for n in $AVAHI_INTERFACE_DNS_SERVERS ; do
|
|
- echo "nameserver $n"
|
|
- done | /sbin/resolvconf -a "$AVAHI_INTERFACE.avahi"
|
|
- fi
|
|
-else
|
|
-
|
|
- # No resolvconf tool available
|
|
-
|
|
- if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then
|
|
+if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then
|
|
test -f /etc/resolv.conf.avahi && mv /etc/resolv.conf.avahi /etc/resolv.conf
|
|
- else
|
|
+else
|
|
test -f /etc/resolv.conf.avahi || mv /etc/resolv.conf /etc/resolv.conf.avahi
|
|
|
|
- for n in $AVAHI_DNS_SERVERS ; do
|
|
- echo "nameserver $n"
|
|
- done > /etc/resolv.conf
|
|
- fi
|
|
+ grep -v ^nameserver /etc/resolv.conf.avahi > /etc/resolv.conf
|
|
+
|
|
+ for n in $AVAHI_DNS_SERVERS ; do
|
|
+ echo "nameserver $n"
|
|
+ done >> /etc/resolv.conf
|
|
fi
|
|
+
|
|
|