Attachment 225341 Details for Bug 304611 – Make file to which "/etc/resolv.conf" is written a configurable option.

[patch] Make file to which "/etc/resolv.conf" is written a configurable option.

network-functions.diff (text/plain), 1.81 KB, created by Thomas Schweikle on 2007-10-12 09:57:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Schweikle

Created: 2007-10-12 09:57:16 UTC

Size: 1.81 KB

patch

obsolete

>--- network-functions.save	2007-09-25 10:55:04.000000000 +0200
>+++ network-functions	2007-09-25 10:07:39.000000000 +0200
>@@ -7,6 +7,9 @@
> PATH="/sbin:/usr/sbin:/bin:/usr/bin"
> export PATH
> 
>+[ -f "/etc/sysconfig/dhclient" ] && . /etc/sysconfig/dhclient
>+[ -z "$resolvconf" ] && resolvconf=/etc/resolv.conf
>+
> [ -z "$__sed_discard_ignored_files" ] && . /etc/init.d/functions
> 
> get_hwaddr ()
>@@ -263,11 +266,11 @@
> set_hostname ()
> {
>     hostname $1
>-    if ! grep search /etc/resolv.conf >/dev/null 2>&1; then
>+    if ! grep search $resolvconf >/dev/null 2>&1; then
> 	domain=`echo $1 | sed 's/^[^\.]*\.//'`
> 	if [ -n "$domain" ]; then
> 		rsctmp=`mktemp /tmp/XXXXXX`;
>-		cat /etc/resolv.conf > $rsctmp
>+		cat $resolvconf > $rsctmp
> 		echo "search $domain" >> $rsctmp
> 		change_resolv_conf $rsctmp
> 		/bin/rm -f $rsctmp
>@@ -401,10 +404,10 @@
>    [ -f "/sys/class/net/$1/bonding/slaves" ]
> }
> 
>-# Invoke this when /etc/resolv.conf has changed:
>+# Invoke this when /etc/resolv has changed:
> change_resolv_conf ()
> {
>-    s=`/bin/grep '^[\ \	]*option' /etc/resolv.conf 2>/dev/null`;
>+    s=`/bin/grep '^[\ \	]*option' $resolvconf 2>/dev/null`;
>     if [ "x$s" != "x" ]; then
>        s="$s"$'\n';
>     fi;
>@@ -431,11 +434,11 @@
> 	  s=`cat $1`;
>        fi;
>     fi;
>-    (echo "$s" > /etc/resolv.conf;) >/dev/null 2>&1;
>+    (echo "$s" > $resolvconf;) >/dev/null 2>&1;
>     r=$?
>     if [ $r -eq 0 ]; then
>-	[ -x /sbin/restorecon ] && /sbin/restorecon /etc/resolv.conf >/dev/null 2>&1 # reset the correct context
>-	logger -p local7.notice -t "NET" -i "$0 : updated /etc/resolv.conf";
>+	[ -x /sbin/restorecon ] && /sbin/restorecon $resolvconf >/dev/null 2>&1 # reset the correct context
>+	logger -p local7.notice -t "NET" -i "$0 : updated $resolvconf";
> 	[ -e /var/lock/subsys/nscd ] && /usr/sbin/nscd -i hosts; # invalidate cache
>     fi;
>     return $r;

Actions: View | Diff

Attachments on bug 304611: 225341