avoid a race condition that might lead to dnsmasq reading an empty resolv.conf (#2007)
SVN-Revision: 7952
This commit is contained in:
		@@ -47,12 +47,13 @@ case "$1" in
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		[ -n "$dns" ] && {
 | 
							[ -n "$dns" ] && {
 | 
				
			||||||
			echo -n > $RESOLV_CONF
 | 
								echo -n > "${RESOLV_CONF}.tmp"
 | 
				
			||||||
			${domain:+echo search $domain} >> $RESOLV_CONF
 | 
								${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
 | 
				
			||||||
			for i in $dns ; do
 | 
								for i in $dns ; do
 | 
				
			||||||
				echo "adding dns $i"
 | 
									echo "adding dns $i"
 | 
				
			||||||
				echo "nameserver $i" >> $RESOLV_CONF
 | 
									echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
 | 
				
			||||||
			done
 | 
								done
 | 
				
			||||||
 | 
								mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		hotplug_event ifup
 | 
							hotplug_event ifup
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user