merge from trunk
This commit is contained in:
commit
a6cd0e8a3c
@ -22,6 +22,7 @@
|
||||
- configdrive: consider partitions as possible datasources if they have
|
||||
theh correct filesystem label. [Paul Querna]
|
||||
- initial freebsd support [Harm Weites]
|
||||
- fix in is_ipv4 to accept IP addresses with a '0' in them.
|
||||
0.7.4:
|
||||
- fix issue mounting 'ephemeral0' if ephemeral0 was an alias for a
|
||||
partitioned block device with target filesystem on ephemeral0.1.
|
||||
|
@ -369,7 +369,7 @@ def is_ipv4(instr):
|
||||
return False
|
||||
|
||||
try:
|
||||
toks = [x for x in toks if int(x) < 256 and int(x) > 0]
|
||||
toks = [x for x in toks if int(x) < 256 and int(x) >= 0]
|
||||
except:
|
||||
return False
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user