Author: mzugec Date: Wed Jun 4 12:49:55 2008 New Revision: 48055 URL: http://svn.opensuse.org/viewcvs/yast?rev=48055&view=rev Log: fixed command-line (bnc#397016) Modified: branches/SuSE-Linux-11_0-Branch/network/VERSION branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes branches/SuSE-Linux-11_0-Branch/network/src/lan/cmdline.ycp Modified: branches/SuSE-Linux-11_0-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/network/VERSION?rev=48055&r1=48054&r2=48055&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/network/VERSION Wed Jun 4 12:49:55 2008 @@ -1 +1 @@ -2.16.47 +2.16.48 Modified: branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes?rev=48055&r1=48054&r2=48055&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes Wed Jun 4 12:49:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 4 12:48:24 CEST 2008 - mzugec@suse.cz + +- fixed command-line (bnc#397016) +- 2.16.48 + +------------------------------------------------------------------- Mon Jun 2 09:21:09 CEST 2008 - mzugec@suse.cz - set link status up for all interfaces during installation Modified: branches/SuSE-Linux-11_0-Branch/network/src/lan/cmdline.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/network/src/lan/cmdline.ycp?rev=48055&r1=48054&r2=48055&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/src/lan/cmdline.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/network/src/lan/cmdline.ycp Wed Jun 4 12:49:55 2008 @@ -181,10 +181,11 @@ LanItems::current = getItem(options, config); LanItems::SetItem(); - if (!(size(LanItems::getCurrentItem()["ifcfg"]:"")>0)){ + if (size(LanItems::getCurrentItem()["ifcfg"]:"")==0){ NetworkInterfaces::Add(); LanItems::operation = `edit; LanItems::interfacename=LanItems::getCurrentItem()["hwinfo", "dev_name"]:""; + LanItems::Items[LanItems::current, "ifcfg"] = LanItems::interfacename; } /* @@ -216,6 +217,7 @@ } } */ +if (contains(Map::Keys(options), "ip")) options["bootproto"] = "static"; LanItems::bootproto = options["bootproto"]:"none"; if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){ @@ -224,7 +226,7 @@ } if (LanItems::bootproto=="static"){ LanItems::ipaddr = options["ip"]:""; - LanItems::netmask = options["netmask"]:""; + LanItems::netmask = options["netmask"]:"255.255.255.0"; } else{ LanItems::ipaddr = ""; LanItems::netmask = ""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org