Fix patch for install. (Add dhcp)

atratsevskiy
Mike Hiretsky 13 years ago
parent 3db516caee
commit 5f425c1e55

@ -3,7 +3,7 @@ AUX calculate-install-2.2.26-r1.patch 4481 RMD160 63434bcbd9c9900485947f3584db42
AUX calculate-install-2.2.26-r2.patch 5209 RMD160 fc5aac1f00291850663f57f46e42a7e98ee43479 SHA1 f6a4ad6a1fb34ec7888a929914f25420463ace5b SHA256 63ee55c476d501445dabb96391540265b9b2cb6594eeb7b1ee53f516526faa45
AUX calculate-install-2.2.26-r3.patch 5983 RMD160 c712232d4fb0b6d8eadce61e741f0328a1c94283 SHA1 ec1c76db7eacf1ae3205b56d7871cb565114c52e SHA256 5bc9879f1eb907a746a9b5286d4d9086d26b217ed88c72931aed024f0e6ee944
AUX calculate-install-2.2.27-fix_rsync.patch 1176 RMD160 023c460d1a8fbeb4d43890ddd87e370b3b7b0928 SHA1 06728d4cb3d5f40f29fe49371d40107b06d94b3f SHA256 ff690ff1738c0a460591c3accf3325dceea6b28ecf8b3bc2fd01003cc80963b2
AUX calculate-install-2.2.27-net_setup.patch 1419 RMD160 16d6ae54ac3026286d07205c52acc5b5570466fe SHA1 6e30ce22bef7f3cf5d191681af85326ccac4a451 SHA256 41420c3fefc636543b749a6af3c082f7bd1d1b3ab5f8e84fbbce52a408e0be32
AUX calculate-install-2.2.27-net_setup.patch 1835 RMD160 b974ae93a19fad1a51b0462deaffe2a34369c647 SHA1 fc1b52fedfa2c3484e930b9dd0d82f49183b614a SHA256 e33b00b61c497868f3bc2bf4bb136a2a35d070ed8852e814e2f9acdf648dc8d2
AUX calculate-install-2.2.27-r1.patch 10617 RMD160 47de9c92cb185d6cc7ff0a8dd97361e5601c0fdb SHA1 59aba284ae84f1a798629aa3cd724014c8712507 SHA256 ac0f7b0300d7aa801b4eaf77d32bbf7c1623bb3fb3621388373c95dba132f0c2
AUX calculate-install-2.2.27-r2.patch 12280 RMD160 1159af138a445816259b1dc1786c2c221c2b18db SHA1 8bed4ff8df12cac8fa920ce11ac0bcd9ee91dce2 SHA256 aefaad54d50b66f7772d94b05ab07cab1df332a4a8330dde08501c251e9c1518
AUX calculate-install-2.2.27-r3.patch 12323 RMD160 3c21ada48087cb828de02be8d005b80a4db6e8e7 SHA1 b0d0759743aa0ddcce065b8816a9776d9834f5d0 SHA256 d8bea2bd40122922277da16aee2427b93d11b95240194c120faa707cf1de4884

@ -1,5 +1,5 @@
diff --git a/pym/cl_install_cmd.py b/pym/cl_install_cmd.py
index ae58080..48c2216 100644
index ae58080..1d84629 100644
--- a/pym/cl_install_cmd.py
+++ b/pym/cl_install_cmd.py
@@ -308,6 +308,7 @@ class install_cmd(share_cmd):
@ -26,3 +26,12 @@ index ae58080..48c2216 100644
for route in values.route:
if not re.match("^({net}|default):(({ipaddr})?"
"(:\w+(:{ipaddr})?)?)?$".format(
@@ -334,6 +337,8 @@ class install_cmd(share_cmd):
value=route,
example="default:192.168.1.1"))
# if system installation
+ if values.dhcp:
+ self.logicObj.clVars.Set('os_install_net_settings','',True)
if values.scheduler:
if not values.scheduler in \
self.logicObj.clVars.Get('os_kernel_schedulers'):

Loading…
Cancel
Save