mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
bitkeeper revision 1.1108.52.1 (410eb854DZhEQqBAsiFdxS10QzU2Sg)
Avoid putting ip= on linux command line unless the user actually wants an address set or is using kernel dhcp.
This commit is contained in:
iap10@labyrinth.cl.cam.ac.uk committed
1 parent
6afe608805
commit
72ded1ca58
1 file changed
+5
-6
@@ -354,18 +354,17 @@ def preprocess_vifs(opts, vals):
|
||||
vals.vif = vifs
|
||||
|
||||
def preprocess_ip(opts, vals):
|
||||
setip = (vals.hostname or vals.netmask
|
||||
or vals.nfs_server
|
||||
or vals.gateway or vals.dhcp or vals.interface)
|
||||
if not setip: return
|
||||
dummy_nfs_server = '1.2.3.4'
|
||||
ip = (vals.ip
|
||||
if vals.ip or vals.dhcp != 'off':
|
||||
dummy_nfs_server = '1.2.3.4'
|
||||
ip = (vals.ip
|
||||
+ ':' + (vals.nfs_server or dummy_nfs_server)
|
||||
+ ':' + vals.gateway
|
||||
+ ':' + vals.netmask
|
||||
+ ':' + vals.hostname
|
||||
+ ':' + vals.interface
|
||||
+ ':' + vals.dhcp)
|
||||
else:
|
||||
ip = ''
|
||||
vals.cmdline_ip = ip
|
||||
|
||||
def preprocess_nfs(opts, vals):
|
||||
|
||||