Rename netsetup to netconf.

lvmraid
Mike Hiretsky 13 years ago
parent 308b2eb358
commit 665f952a25

@ -1120,7 +1120,7 @@ class fillVars(object, glob_attr):
readLinesFile('/etc/resolv.conf')))) readLinesFile('/etc/resolv.conf'))))
return dnsSearch return dnsSearch
def get_os_install_net_setup(self): def get_os_install_net_conf(self):
"""Net setup (networkmanager or openrc)""" """Net setup (networkmanager or openrc)"""
if filter(lambda x:x.lower() == ("networkmanager"), if filter(lambda x:x.lower() == ("networkmanager"),
listDirectory('/etc/runlevels/boot')+ listDirectory('/etc/runlevels/boot')+

@ -879,7 +879,7 @@ class cl_install(color_print, SignalInterrupt):
(_("Timezone"),clGet('os_install_clock_timezone'),True), (_("Timezone"),clGet('os_install_clock_timezone'),True),
], ],
[(_("Network services"),hdd), [(_("Network services"),hdd),
(_("Network manager"),clGet('os_install_net_setup'),True), (_("Network manager"),clGet('os_install_net_conf'),True),
(_("PROXY"), (_("PROXY"),
clGet('os_install_proxy') or _("none"),True), clGet('os_install_proxy') or _("none"),True),
(_("NTP"),clGet('os_install_ntp') or _("none"),True), (_("NTP"),clGet('os_install_ntp') or _("none"),True),

@ -93,7 +93,7 @@ CMD_OPTIONS = [{'shortOption':"d",
'optVal':"HOSTNAME", 'optVal':"HOSTNAME",
'help':_("set short hostname of full hostname") 'help':_("set short hostname of full hostname")
}, },
{'longOption':"netsetup", {'longOption':"netconf",
'optVal':"NETMANAGER", 'optVal':"NETMANAGER",
'type':'choice', 'type':'choice',
'choices_regignore': NM_LIST, 'choices_regignore': NM_LIST,
@ -331,7 +331,7 @@ class install_cmd(share_cmd):
if not isPkgInstalled(setup): if not isPkgInstalled(setup):
self.printERROR(_("Network manager %s is not installed")%setup) self.printERROR(_("Network manager %s is not installed")%setup)
return False return False
self.logicObj.clVars.Set("os_install_net_setup",setup,True) self.logicObj.clVars.Set("os_install_net_conf",setup,True)
return True return True
def setVars(self,options): def setVars(self,options):

@ -297,7 +297,7 @@ class Data:
os_install_net_dns = {} os_install_net_dns = {}
# net setup (networkmanager or openrc) # net setup (networkmanager or openrc)
os_install_net_setup = {} os_install_net_conf = {}
# dhcp or not # dhcp or not
os_install_net_dhcp_set = {} os_install_net_dhcp_set = {}

@ -41,7 +41,7 @@ if __name__ == "__main__":
# init variables # init variables
install.setProxyNtpHostname(options.proxy,options.ntp,options.hostname) install.setProxyNtpHostname(options.proxy,options.ntp,options.hostname)
if not install.setNetworkParams(options.ip,options.route,options.dns, if not install.setNetworkParams(options.ip,options.route,options.dns,
options.netsetup,options.dhcp): options.netconf,options.dhcp):
sys.exit(1) sys.exit(1)
if options.l: if options.l:
if not install.setLang(options.l): if not install.setLang(options.l):

Loading…
Cancel
Save