etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 8892: accept nameserver configurations on non-default networks. this is because if dnsmasq sends no nameservers, dhclient deletes all entries from resolv.conf. the MS will send the eth0 ip of the dhcp server / virtual router on the default network as the nameserver on the non-default networks

This commit is contained in:
Chiradeep Vittal 2011-03-07 16:18:04 -08:00
parent 0499e410f2
commit d07b07bfa8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/systemvm/debian/config/etc/init.d/cloud-early-config
View File

@ -285,17 +285,21 @@ setup_dhcpsrvr() {
setup_dnsmasq
setup_apache2 $ETH0_IP
NS=$NS1
[ -n "$NS2" ] && NS=$NS1,$NS2
if [ "$DEFAULTROUTE" != "false" ]
then
sed -i -e "/^[#]*dhcp-option=option:router.*$/d" /etc/dnsmasq.conf
echo "dhcp-option=option:router,$GW" >> /etc/dnsmasq.conf
#for now set up ourself as the dns server as well
sed -i -e "/^[#]*dhcp-option=6.*$/d" /etc/dnsmasq.conf
echo "dhcp-option=6,$ETH0_IP,$NS1,$NS2" >> /etc/dnsmasq.conf
echo "dhcp-option=6,$ETH0_IP,$NS" >> /etc/dnsmasq.conf
else
sed -i -e "/^[#]*dhcp-option=option:router.*$/d" /etc/dnsmasq.conf
echo "dhcp-option=option:router" >> /etc/dnsmasq.conf
sed -i -e "/^[#]*dhcp-option=6.*$/d" /etc/dnsmasq.conf
echo "dhcp-option=6,$NS" >> /etc/dnsmasq.conf
fi
sed -i /gateway/d /etc/hosts