LinHES-config: confilict merge

1 files changed, 10 insertions, 2 deletions

diff --git a/abs/core-testing/LinHES-config/systemconfig.py b/abs/core-testing/LinHES-config/systemconfig.py
index 4418003..b2f8529 100755
--- a/abs/core-testing/LinHES-config/systemconfig.py
+++ b/abs/core-testing/LinHES-config/systemconfig.py
@@ -50,9 +50,9 @@ def main(argv):
     global systemconfig
     systemconfig["MVROOT"]=MVROOT
     restartlcd = False
-    cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False}
+    cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False, "dhcp_request":False }
     try:
-        opts,  args = getopt.getopt(argv,  'c:hm:',  ["help","modules" ] )
+        opts,  args = getopt.getopt(argv,  'c:hm:d:',  ["help","modules" ] )
     except getopt.GetoptError, why:
         print why
         usage()
@@ -65,6 +65,9 @@ def main(argv):
         elif opt in ("-m"):
             for i in arg.split(","):
                 cmdmodule[i]=True
+        elif opt in ("-d"):
+            dhcp_dev = arg
+
 
     if cmdmodule["this_is_install"] or cmdmodule["hostypec"]:
         systemconfig["hostypec"] = True
@@ -185,6 +188,11 @@ def main(argv):
             mv_common.runcmd(cmd)
         logging.info("__End of ssh user\n")
 
+    if cmdmodule["dhcp_request"]:
+        cmd = '''dhcpcd -t4 -h' ' -Td %s > /tmp/mvnetwork.dhcpinfo ''' %dhcp_dev
+        mv_common.runcmd(cmd)
+
+
 if __name__ == "__main__":
 
     config_file = "mv_config"