Attachment 272729 Details for Bug 134692

[patch] Proposed /sbin/modify_resolvconf fixes for forwarders.conf creation

sysconfig-0.70.2-modify_resolvconf-forwarders.dif (text/plain), 2.25 KB, created by Marius Tomaschewski on 2009-02-13 16:31:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2009-02-13 16:31:31 UTC

Size: 2.25 KB

patch

obsolete

>--- scripts/modify_resolvconf
>+++ scripts/modify_resolvconf	2009/02/13 15:59:50
>@@ -210,8 +210,21 @@ write_namedconf () {
>       # Yes, put the comment right after that comment
>       sed -e "/^[[:space:]]*# your provider's name server./a\        forwarders {$FORWDS };" $TMP_FILE > $TMP_DATA
>     else
>-      # No, so just put the option right after the "options {" block opening
>-      sed -e "/^options {/a\        forwarders {$FORWDS };" $TMP_FILE > $TMP_DATA
>+      # No active forwarders
>+      case "$FILENAME" in
>+        (*/named.conf)
>+          # Just put the option right after the "options {" block opening
>+          # (legacy code in case user set NAMEDCONF back to /etc/named.conf)
>+          sed -e "/^options {/a\        forwarders {$FORWDS };" $TMP_FILE > $TMP_DATA
>+        ;;
>+        (*)
>+	  # forwarders.conf -- just append the forwarders...
>+          (cat $TMP_FILE;
>+           echo "";
>+           echo "        forwarders {$FORWDS };";
>+           echo "";) > $TMP_DATA
>+        ;;
>+      esac
>     fi
>   fi
> }
>@@ -228,8 +241,8 @@ write_file () {
> }
> 
> read_file () {
>-  sed "/### BEGIN INFO/,/### END INFO/d" $FILENAME > $TMP_DATA
>-  echo "" >> $TMP_DATA
>+  [ -e $FILENAME ] && sed "/### BEGIN INFO/,/### END INFO/d" $FILENAME > $TMP_DATA
>+  #echo "" >> $TMP_DATA
>   case "$FILENAME" in
>     *resolv*) read_resolvconf; ;;
>     *named*)  read_namedconf; ;;
>@@ -442,7 +455,7 @@ case "$FILENAME" in
>     exit
>     ;;
>   $NAMEDCONF)
>-    if ! [ -r "$FILENAME" -a -x /etc/init.d/named ] ; then
>+    if ! [ -d "${FILENAME%/*}/" -a -x /etc/init.d/named ] ; then
>       if [ "$ACTION" = "cleanup" ] ; then
>         exit 0
>       else
>@@ -451,6 +464,14 @@ case "$FILENAME" in
>         log "Check your settings of MODIFY_RESOLV\NAMED_CONF_DYNAMICALLY"
>         exit 1
>       fi
>+    elif [ "$ACTION" != "cleanup" -a \
>+           -r /etc/named.conf -a "${NAMEDCONF##*/}" != named.conf ] ; then
>+    	grep -qs -e "^[[:space:]]*include.*${NAMEDCONF}" /etc/named.conf || {
>+	  debug "WARNING: Service $SERVICE will try to modify $FILENAME, but the" \
>+                "/etc/named.conf seems not to include it."
>+	  debug "         Add an include \"$NAMEDCONF\"; statement inside of the" \
>+                "options { }; block to the /etc/named.conf."
>+	}
>     fi
>     ;;
>   $RESOLVCONF)

Actions: View | Diff

Attachments on bug 134692: 83242 | 272729