From 665f952a252c9f56de613ba90098be40280a437c Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Tue, 21 Jun 2011 17:03:14 +0400
Subject: [PATCH] Rename netsetup to netconf.

---
 pym/cl_fill_install.py | 2 +-
 pym/cl_install.py      | 2 +-
 pym/cl_install_cmd.py  | 4 ++--
 pym/cl_vars_install.py | 2 +-
 scripts/cl-install     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
index 2144f20..beb7036 100644
--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
@@ -1120,7 +1120,7 @@ class fillVars(object, glob_attr):
                     readLinesFile('/etc/resolv.conf'))))
         return dnsSearch
 
-    def get_os_install_net_setup(self):
+    def get_os_install_net_conf(self):
         """Net setup (networkmanager or openrc)"""
         if filter(lambda x:x.lower() == ("networkmanager"),
            listDirectory('/etc/runlevels/boot')+
diff --git a/pym/cl_install.py b/pym/cl_install.py
index e90ac8f..0644015 100644
--- a/pym/cl_install.py
+++ b/pym/cl_install.py
@@ -879,7 +879,7 @@ class cl_install(color_print, SignalInterrupt):
              (_("Timezone"),clGet('os_install_clock_timezone'),True),
             ],
             [(_("Network services"),hdd),
-             (_("Network manager"),clGet('os_install_net_setup'),True),
+             (_("Network manager"),clGet('os_install_net_conf'),True),
              (_("PROXY"),
               clGet('os_install_proxy') or _("none"),True),
              (_("NTP"),clGet('os_install_ntp') or _("none"),True),
diff --git a/pym/cl_install_cmd.py b/pym/cl_install_cmd.py
index b33f2a2..c7d76da 100644
--- a/pym/cl_install_cmd.py
+++ b/pym/cl_install_cmd.py
@@ -93,7 +93,7 @@ CMD_OPTIONS = [{'shortOption':"d",
                 'optVal':"HOSTNAME",
                 'help':_("set short hostname of full hostname")
                },
-               {'longOption':"netsetup",
+               {'longOption':"netconf",
                 'optVal':"NETMANAGER",
                 'type':'choice',
                 'choices_regignore': NM_LIST,
@@ -331,7 +331,7 @@ class install_cmd(share_cmd):
             if not isPkgInstalled(setup):
                 self.printERROR(_("Network manager %s is not installed")%setup)
                 return False
-            self.logicObj.clVars.Set("os_install_net_setup",setup,True)
+            self.logicObj.clVars.Set("os_install_net_conf",setup,True)
         return True
 
     def setVars(self,options):
diff --git a/pym/cl_vars_install.py b/pym/cl_vars_install.py
index 19c97d7..77ae323 100644
--- a/pym/cl_vars_install.py
+++ b/pym/cl_vars_install.py
@@ -297,7 +297,7 @@ class Data:
     os_install_net_dns = {}
 
     # net setup (networkmanager or openrc)
-    os_install_net_setup = {}
+    os_install_net_conf = {}
 
     # dhcp or not
     os_install_net_dhcp_set = {}
diff --git a/scripts/cl-install b/scripts/cl-install
index affb39c..ce0cdac 100644
--- a/scripts/cl-install
+++ b/scripts/cl-install
@@ -41,7 +41,7 @@ if __name__ == "__main__":
     # init variables
     install.setProxyNtpHostname(options.proxy,options.ntp,options.hostname)
     if not install.setNetworkParams(options.ip,options.route,options.dns,
-                            options.netsetup,options.dhcp):
+                            options.netconf,options.dhcp):
         sys.exit(1)
     if options.l:
         if not install.setLang(options.l):