Просмотр исходного кода

avoid a race condition that might lead to dnsmasq reading an empty resolv.conf (#2007)

SVN-Revision: 7952
Felix Fietkau 18 лет назад
Родитель
Сommit
1b4380b8ed
1 измененных файлов с 4 добавлено и 3 удалено
  1. 4 3
      package/base-files/files/usr/share/udhcpc/default.script

+ 4 - 3
package/base-files/files/usr/share/udhcpc/default.script

@@ -47,12 +47,13 @@ case "$1" in
 		}
 		
 		[ -n "$dns" ] && {
-			echo -n > $RESOLV_CONF
-			${domain:+echo search $domain} >> $RESOLV_CONF
+			echo -n > "${RESOLV_CONF}.tmp"
+			${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
 			for i in $dns ; do
 				echo "adding dns $i"
-				echo "nameserver $i" >> $RESOLV_CONF
+				echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
 			done
+			mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
 		}
 		
 		hotplug_event ifup