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

CLOUDSTACK-9042: VR: DHCP: fix missing DHCP host enties 

in /etc/dhcpentries.txt we had:

02:00:1e:07:01:53,set:10_102_92_5,10.102.92.5,songlog-1,infinite
02:00:0b:a2:00:3d,set:10_102_92_234,10.102.92.234,log-1,infinite

This sed matched unexpectetly "songlog-1" as well when "log-1" was processed, resulting
missing dhcp entry for songlog-1.

Also fixed other potenials problems relating to sed matching.

(cherry picked from commit e7291fd600)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rene Moser 2015-11-06 12:25:10 +01:00 committed by Rohit Yadav
parent c7e1d783a5
commit ca5f90b5dd
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh
View File

@ -110,10 +110,10 @@ logger -t cloud "edithosts: update $mac $ipv4 $ipv6 $host to hosts"
[ ! -f $DHCP_LEASES ] && touch $DHCP_LEASES
#delete any previous entries from the dhcp hosts file
sed -i /$mac/d $DHCP_HOSTS
sed -i /^$mac,/d $DHCP_HOSTS
if [ $ipv4 ]
then
sed -i /$ipv4,/d $DHCP_HOSTS
sed -i /,$ipv4,/d $DHCP_HOSTS
fi
if [ $ipv6 ]
then
@ -121,7 +121,7 @@ then
sed -i /$ipv6],/d $DHCP_HOSTS
fi
# don't want to do this in the future, we can have same VM with multiple nics/entries
sed -i /$host,/d $DHCP_HOSTS
sed -i /,$host,/d $DHCP_HOSTS
#put in the new entry
if [ $ipv4 ]
@ -143,15 +143,15 @@ then
#delete leases to supplied mac and ip addresses
if [ $ipv4 ]
then
sed -i /$mac/d $DHCP_LEASES
sed -i /"$ipv4 "/d $DHCP_LEASES
sed -i /\b$mac\b/d $DHCP_LEASES
sed -i /\b$ipv4\b/d $DHCP_LEASES
fi
if [ $ipv6 ]
then
sed -i /$duid/d $DHCP_LEASES
sed -i /"$ipv6 "/d $DHCP_LEASES
sed -i /\b$duid\b/d $DHCP_LEASES
sed -i /\b$ipv6\b/d $DHCP_LEASES
fi
sed -i /"$host "/d $DHCP_LEASES
sed -i /\b$host\b/d $DHCP_LEASES
#put in the new entry
if [ $ipv4 ]
@ -167,11 +167,11 @@ fi
#edit hosts file as well
if [ $ipv4 ]
then
sed -i /"$ipv4 "/d $HOSTS
sed -i /\b$ipv4\b/d $HOSTS
fi
if [ $ipv6 ]
then
sed -i /"$ipv6 "/d $HOSTS
sed -i /\b$ipv6\b/d $HOSTS
fi
sed -i /" $host$"/d $HOSTS
if [ $ipv4 ]
@ -201,7 +201,7 @@ then
fi
[ "$routes" != "" ] && echo "$tag,121,$routes" >> $DHCP_OPTS
#delete entry we just put in because we need a tag
sed -i /$ipv4,/d $DHCP_HOSTS
sed -i /,$ipv4,/d $DHCP_HOSTS
#put it back with a tag
echo "$mac,set:$tag,$ipv4,$host,infinite" >>$DHCP_HOSTS
fi