March 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55848 - in /branches/tmp/juhliarik/bootloader-UIrefactor/src: ChangeLog modules/ChangeLog
by jreidinger＠svn.opensuse.org 02 Mar '09

02 Mar '09

Author: jreidinger Date: Mon Mar 2 15:09:02 2009 New Revision: 55848 URL: http://svn.opensuse.org/viewcvs/yast?rev=55848&view=rev Log: remove another useless changelogs Removed: branches/tmp/juhliarik/bootloader-UIrefactor/src/ChangeLog branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/ChangeLog -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55847 - in /trunk/network/src: modules/Lan.ycp modules/LanItems.ycp routines/summary.ycp
by mzugec＠svn.opensuse.org 02 Mar '09

02 Mar '09

Author: mzugec Date: Mon Mar 2 14:58:43 2009 New Revision: 55847 URL: http://svn.opensuse.org/viewcvs/yast?rev=55847&view=rev Log: deleted unsused code Modified: trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp trunk/network/src/routines/summary.ycp Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Mar 2 14:58:43 2009 @@ -86,28 +86,6 @@ global block<boolean> AbortFunction = nil; - -/*--------------*/ -/* PRIVATE DATA */ - - - -/** - * Modules information - * @see ReadModules - */ -// FIXME: MOD map Modules = $[]; - -/** - * Deleted modules - */ -// FIXME: MOD list<string> DeletedModules = []; - - -// FIXME: used in lan/address.ycp (#17346) -> "global" - - - /*------------------*/ /* GLOBAL FUNCTIONS */ @@ -137,7 +115,6 @@ map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { -// string confname = NetworkInterfaces::device_name(devtype, devnum); string mac = ((map<string, any>)SCR::Execute(.target.bash_output, sformat("cat /sys/class/net/%1/address|tr -d '\n'", devname)))["stdout"]:""; y2milestone("confname %1", mac); if (!haskey(link_status, mac)) y2error("Mac address %1 not found in map %2!", mac, link_status); @@ -151,14 +128,6 @@ } - - -//include "network/hardware.ycp"; -//include "network/install.ycp"; -//include "network/routines.ycp"; -//include "network/runtime.ycp"; - - /** * Lan::Read (`cache) will do nothing if initialized already. */ @@ -334,7 +303,6 @@ global define boolean Write() { y2milestone("Writing configuration"); -// if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); /* Stop the detection */ if(!LanItems::modified) { @@ -439,7 +407,6 @@ if(Abort()) return false; /* Progress step 9 */ ProgressNextStage(_("Activating network services...")); -// NetworkModules::HwUp (); // during installation export sysconfig settings into NetworkManager (bnc#433084) if (Mode::installation() && NetworkService::IsManaged()) y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections")); @@ -485,7 +452,6 @@ else if(Service::Status("network")==0){ Service::Reload("network"); } else Service::Restart("network"); -// NetworkService::StartStop (); sleep(sl); } @@ -691,10 +657,8 @@ * @return true if success */ global define boolean Add() { -// LanItems::operation = nil; if(LanItems::Select("") != true) return false; NetworkInterfaces::Add(); -// LanItems::AddNew(); return true; } @@ -893,144 +857,6 @@ -// Add(); - -// map tosel = nil; - - /* Some HW found -> use it for proposal */ -// if(size(LanItems::Hardware) > 0) { -// if (Arch::s390()){ -// tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); -// } -// else -// tosel = LanItems::FindMatchingDevice($[]); - -// } - - -// y2debug("Hardware=%1", LanItems::Hardware); -// y2milestone ("Selected HW w/o install.inf patches: %1", tosel); - -/* - // do not select a card without a driver, #29296 - if (tosel != nil) - { - // L3 N#81533 - // Autoyast takes network config from install.inf, has - // problem with hardware that has a choice of drivers: - // Module A is used even though install.inf says module B. - // It is because we selected the _hardware_ and then took - // the first module. - // Future: select hardware+driver together - // CODE 9 fix: for the selected hardware, patch in the driver - - // We cannot simply _create_ tosel from install.inf data because - // SelectHW relies on the detected info (eg. busid) from hwinfo - // which is not in install.inf - - - if (InstallInf["module"]:"" != "") - { - y2milestone ("Using driver module from install.inf"); - tosel["module"] = InstallInf["module"]:""; - } - // L3 bug: 75720 - // Setup module options available from /etc/install.inf - string _options = InstallModuleOptions(tosel["module"]:""); - if (_options != "" && _options!=nil) { - y2milestone ("Using driver options from install.inf"); - tosel["options"] = _options; - } - - y2milestone ("Selected HW with install.inf patches: %1", tosel); - SelectHWMap(tosel); - // set layer2 status from /etc/install.inf - qeth_layer2 = (InstallInf["QETH_LAYER2_SUPPORT"]:"0"=="1")?true:false; - qeth_macaddress = InstallInf["LLADDR"]:""; - } - // Nothing detected -> use InstallInf - - else if(size(InstallInf) > 0) { - - if(!haskey(InstallInf, "module")) { - y2milestone("No hardware, no install.inf module -> no proposal."); - return false; - } - - // FIXME: MOD Module["module"] = InstallInf["module"]:""; - // FIXME: MOD Module["options"] = InstallInf["options"]:""; - - NetworkModules::Alias = InstallInf["module"]:""; - NetworkModules::Options = InstallInf["options"]:""; - - - type = InstallInf["type"]:"eth"; - device = NetworkInterfaces::GetFreeDevice(type); - } - - else { - y2milestone("No hardware, no install.inf -> no proposal."); - return false; - } -*/ - -// here we know the hardware and could fill the interface defaults for it, -// like for wifi usercontrol and for eth|wifi ifplugd. -// This is proposal. also need to do it with -// - add from ui: detected and undetected -// - autoyast -// LanItems::SetDefaultsForHW (); - - // #145041 -// ethtool_options = InstallInf["ethtool_options"]:""; - - // #176804 -/* - if (NetworkStorage::isDiskOnNetwork ( NetworkStorage::getDevice("/") )) - { - LanItems::startmode = "nfsroot"; - y2milestone ("startmode nfsroot"); - } -*/ -// ipaddr = InstallInf["ipaddr"]:""; -// bootproto = InstallInf["bootproto"]:"static"; -// y2debug("ipaddr,bootproto=%1,%2", LanItems::ipaddr, LanItems::bootproto); -// if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) { - -// y2milestone("static proposal"); - - /* propose address setup from /etc/install.inf */ -// netmask = InstallInf["netmask"]:""; -// if(LanItems::netmask == nil || LanItems::netmask == "") -// LanItems::netmask = "255.255.255.0"; -// } -// else { - /* Propose static config in case of DSL hardware is found */ -// list pppoe = (list) SCR::Read(.probe.pppoe); - // FIXME: testing pppoe = [ $["a" : "b"] ]; -// map pppoedev = pppoe[0]:$[]; -// y2milestone ("pppoe=%1", pppoe); -// if(pppoe != nil && size(pppoe) > 0) { -// y2milestone("DSL proposal"); -// LanItems::ipaddr = ""; -// LanItems::bootproto = "static"; -// } -// else { - // Open Enterprise Server does not like DHCP (#50524). - // In that case, we cannot propose. -// if (ProductFeatures::GetBooleanFeature ("network", "force_static_ip")) -// { -// y2milestone ("Static config forced but no info available -> no proposal."); -// return false; -// } -// y2milestone("DHCP proposal"); -// LanItems::ipaddr = ""; -// LanItems::bootproto = "dhcp"; -// } -// } - -// LanItems::Commit(); - y2milestone("NetworkConfig::Config=%1", NetworkConfig::Config); y2milestone("NetworkConfig::DHCP=%1", NetworkConfig::DHCP); @@ -1049,31 +875,7 @@ return false; } -/* - y2milestone ("hostname from install.inf"); - if (! DNS::ReadHostDomain (InstallInf["hostname"]:"", - InstallInf["domain"]:"")) - { - y2milestone ("hostname from dns"); - // try to get hostname from the network - string hnent = NetHwDetection::ResolveIP(ipaddr); - - //last resort - generate random hostname (#165269) - if (hnent == "") - { - y2milestone("random hostname"); - srandom (); - DNS::ReadHostDomain("linux-" + String::Random(4), "site"); - } - else - { - list hnsplit = Hostname::SplitFQ(hnent); - DNS::ReadHostDomain (hnsplit[0]:"", hnsplit[1]:""); - } - - } -*/ - return true; + return true; } /** @@ -1082,11 +884,6 @@ */ global define boolean ProposeRoutesAndResolver () { if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) { - /* propose default gateway from /etc/install.inf */ -// Routing::ReadFromGateway (InstallInf["gateway"]:""); - - /* propose DNS setup from /etc/install.inf */ -// DNS::ReadNameserver (InstallInf["nameserver"]:""); ProposeHostname (); } return true; @@ -1097,8 +894,8 @@ * @return true if something was proposed */ global define boolean Propose() { -NetworkInterfaces::CleanCacheRead(); -LanItems::Read(); + NetworkInterfaces::CleanCacheRead(); + LanItems::Read(); return ProposeInterfaces () && ProposeRoutesAndResolver (); @@ -1140,24 +937,9 @@ aymodule["module"]:"" : tosel["module"]:""; tosel["options"] = (aymodule["options"]:""!= "")? aymodule["options"]:"" : tosel["options"]:""; - - LanItems::SelectHWMap(tosel); - } - /* Nothing detected -> use InstallInf */ -/* - else if(size(InstallInf) > 0) { - if(!haskey(InstallInf, "module")) { - y2milestone("No hardware, no install.inf module -> no proposal."); - return false; - } - NetworkModules::Alias = InstallInf["module"]:""; - NetworkModules::Options = InstallInf["options"]:""; - -// type = InstallInf["type"]:"eth"; - device = NetworkInterfaces::GetFreeDevice(type); + LanItems::SelectHWMap(tosel); } -*/ else { y2milestone("No hardware, no install.inf -> no autoinstallation possible."); return false; @@ -1179,14 +961,14 @@ LanItems::SetDeviceVars(interface, defaults); y2debug("ipaddr,bootproto=%1,%2", LanItems::ipaddr, LanItems::bootproto); - if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) + if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) { y2milestone("static configuration"); if(LanItems::netmask == nil || LanItems::netmask == "") LanItems::netmask = "255.255.255.0"; - + } LanItems::Commit(); }); @@ -1251,13 +1033,6 @@ */ global list<string> Packages () { list<string> pkgs = []; - // #299033 - don't install smpppd now, do it later (with some tests) -/* - if (NetworkInterfaces::Locate ("USERCONTROL", "yes") != []) - { - if (!PackageSystem::Installed("smpppd")) pkgs = add (pkgs, "smpppd"); - } -*/ map<string, any> required = $[ "types":$[ "wlan" : "wireless-tools", @@ -1318,13 +1093,6 @@ global define boolean HaveXenBridge () { // changed xen bridge detection (bnc#375606) boolean have_br = FileUtils::Exists("/dev/shm/sysconfig/xenbridges"); - // #2248874 - disallow error message -/* - if (PackageSystem::Installed("bridge-utils")){ - string cmd = "brctl show | grep '^xenbr'"; - have_br = SCR::Execute (.target.bash, cmd) == 0; - } -*/ y2milestone ("Have Xen bridge: %1", have_br); return have_br; } Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Mon Mar 2 14:58:43 2009 @@ -236,7 +236,6 @@ if (size(Items[key, "udev", "net"]:[])>0) { string dev_name = Items[key, "hwinfo", "dev_name"]:""; current=key; -// net_rules = add(net_rules, sformat("SUBSYSTEM==\"net\", DRIVERS==\"?*\", %1, NAME=\"%2\"", GetItemUdev("ATTR{address}"), GetItemUdev("NAME"))); net_rules = add(net_rules, mergestring(Items[key, "udev", "net"]:[], ", ")); if (dev_name!=GetItemUdev("NAME")) { changed_devices = add(changed_devices, dev_name); @@ -503,19 +502,6 @@ } } - // build the "Bond Slaves" entry of rich box - if (type == "bond") - { -/* - string slaves = ""; - foreach (string key, any value, (map<string, any>)v, { - if ((value != nil) && (regexpmatch(key, "BONDING_SLAVE[0-9]"))) - slaves = slaves + ((slaves != "") ? ", " : "") + (string)value; - }); - if (slaves != "") - bullets = bullets + [_("Bond slaves")+ " : " + slaves]; -*/ - } if (type == "wlan" && !(NetworkInterfaces::Current["WIRELESS_AUTH_MODE"]:"" != "open") && !hasAnyValue(NetworkInterfaces::Current["WIRELESS_KEY_0"]:"")) @@ -645,14 +631,6 @@ // FIXME: devname hotplug = ""; - if(hotplug == "") { - // FIXME: MOD Module["module"] = hw["module"]:""; - // FIXME: MOD Module["options"] = hw["options"]:""; -// NetworkModules::Alias = hardware["module"]:""; -// NetworkModules::Options = hardware["options"]:""; - } - else - y2milestone("HOTPLUG(%1) -> ignoring modprobe.conf", hotplug); // Wireless Card Features wl_auth_modes = prepend(hardware["wl_auth_modes"]:nilliststring, "no-encryption"); @@ -956,91 +934,34 @@ } type = Items[current, "hwinfo", "type"]:"eth"; -// type = "eth0"; device = NetworkInterfaces::GetFreeDevice(type); - // FIXME: MOD AddModule(type); -// NetworkModules::AddM(); -// nm_name = NetworkModules::GetFreeName("static-"); // TODO: instead of udev use hwinfo dev_name NetworkInterfaces::Name = GetItemUdev("NAME"); if (size(Items)<current) Items[current] = $["ifcfg":NetworkInterfaces::Name]; else Items[current, "ifcfg"] = NetworkInterfaces::Name; -// interfacename = GetItemUdev()[1]:""; /* FIXME: alias: how to prefill new alias? */ alias = ""; -// } - /* dev!="" -> Edit */ -/* FIXME: NI: - else { - if(!CheckDevice(dev)) { - y2error("Device not found: %1", dev); - return false; - } - NetworkInterfaces::Edit(dev); - devmap = NetworkInterfaces::Current; - type = NetworkInterfaces::device_type(dev); - device = NetworkInterfaces::device_num(dev); - alias = NetworkInterfaces::alias_num(dev); - } -*/ /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); SetDeviceVars(devmap, SysconfigDefaults); hotplug = ""; - /* - if(issubstring(device, "bus-pcmcia")) - hotplug = "pcmcia"; - else if(issubstring(device, "bus-usb")) - hotplug = "usb"; - */ y2debug("type=%1", type); if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1"); y2debug("type=%1", type); - /* kernel options */ -// if(hotplug == "" && alias == "" && nm_name != "") { - // FIXME: MOD SelectModule(dev); -// NetworkModules::SelectM(nm_name); -// } -// else { - // FIXME: MOD SelectModule(""); -// NetworkModules::AddM(); -// } - -// qeth_options = NetworkModules::QETH_OPTIONS; -// chan_mode = NetworkModules::CCW_CHAN_MODE; -// lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; - -/* - if (NetworkModules::QETH_IPA_TAKEOVER == nil || - NetworkModules::QETH_IPA_TAKEOVER == "" || - NetworkModules::QETH_IPA_TAKEOVER == "0") - ipa_takeover = false; - else - ipa_takeover = true; - - if (NetworkModules::QETH_LAYER2_SUPPORT == nil || - NetworkModules::QETH_LAYER2_SUPPORT == "" || - NetworkModules::QETH_LAYER2_SUPPORT == "0") - qeth_layer2 = false; - else - qeth_layer2 = true; -*/ /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; } - //if(bootproto == "none") bootproto = "static"; - return true; } @@ -1086,77 +1007,6 @@ } newdev["NAME"] = description; if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type; -// if(unique != "" && unique != nil) newdev["udi"] = unique; -/* - if(hotplug == "") { - if(alias == "") { - // FIXME: MOD ChangeModule(NetworkInterfaces::device_name(type, device), operation == `add); - y2milestone("HWCFG name %1 (%2)", nm_name, nm_name_old); - if(hasAnyValue(nm_name) && operation == `edit && - hasAnyValue(nm_name_old) && nm_name != nm_name_old) { - y2milestone("HWCFG name change (%1) -> deleting old (%2)", nm_name, nm_name_old); - NetworkModules::DeleteM(nm_name_old); - nm_name_old = nil; - } - - if(Arch::s390 ()) { - string type2 = DriverType (type); - if(type2 == "iucv") { - NetworkModules::SCRIPTUP = "hwup-iucv"; - } - else { - NetworkModules::SCRIPTUP = "hwup-ccw"; - NetworkModules::SCRIPTUP_ccw = "hwup-ccw"; - NetworkModules::SCRIPTDOWN = "hwdown-ccw"; - NetworkModules::SCRIPTUP_ccwgroup = "hwup-" + type2; - } - - integer devid = 0; - string devstr = ""; - - y2milestone("nm_name=%1", nm_name); - string s390chanid = "[0-9]+\\.[0-9]+\\."; - if(regexpmatch(nm_name, s390chanid)) { - devid = tointeger("0x" + regexpsub(nm_name, s390chanid + "(.*)", "\\1")); - devstr = regexpsub(nm_name, ".*[^0-9](" + s390chanid + ").*", "\\1"); - } - - y2milestone("devid=%1(%2)", devid, devstr); - if(devid == nil) devid = 0; - string devid0 = String::PadZeros(regexpsub(tohexstring(devid), "0x(.*)", "\\1"), 4); - string devid1 = String::PadZeros(regexpsub(tohexstring(devid+1), "0x(.*)", "\\1"), 4); - string devid2 = String::PadZeros(regexpsub(tohexstring(devid+2), "0x(.*)", "\\1"), 4); - - if(type2 == "ctc" || type2 == "lcs") { - NetworkModules::CCW_CHAN_IDS = sformat("%1%2 %1%3", devstr, devid0, devid1); - NetworkModules::CCW_CHAN_MODE = chan_mode; - NetworkModules::CCW_CHAN_NUM = "2"; - NetworkModules::LCS_LANCMD_TIMEOUT = lcs_timeout; - } - else if(type2 == "qeth") { - NetworkModules::CCW_CHAN_IDS = sformat("%1%2 %1%3 %1%4", devstr, devid0, devid1, devid2); - NetworkModules::CCW_CHAN_MODE = chan_mode; - NetworkModules::CCW_CHAN_NUM = "3"; - NetworkModules::QETH_OPTIONS = qeth_options; - NetworkModules::QETH_IPA_TAKEOVER = ipa_takeover? "1": "0"; - NetworkModules::QETH_LAYER2_SUPPORT = qeth_layer2? "1": "0"; - if (qeth_layer2 && qeth_macaddress != "00:00:00:00:00:00") { - newdev["LLADDR"] = qeth_macaddress; - } - else { - // #151196: layer 3 otherwise fails - newdev["LLADDR"] = ""; - } - } - - } - - // If "", no hwcfg is created. See also #42421. - if (NetworkModules::ChangeM(nm_name)) Items[current, "hwcfg"]=nm_name; - else Items[current, "hwcfg"]=""; - } - } -*/ if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes"; @@ -1230,18 +1080,10 @@ newdev["WIRELESS_POWER"] = wl_power ? "yes" : "no"; } -// if(hasAnyValue(nm_name)) newdev["_nm_name"] = nm_name; - if(DriverType (type) == "ctc") if(NetworkConfig::Config["WAIT_FOR_INTERFACES"]:nil == nil || NetworkConfig::Config["WAIT_FOR_INTERFACES"]:0 < 40) NetworkConfig::Config["WAIT_FOR_INTERFACES"] = 40; - /* FIXME: MOD - if(DriverType (type) == "qeth") - if(NetworkConfig::Config["WAIT_FOR_INTERFACES"]:nil == nil || NetworkConfig::Config["WAIT_FOR_INTERFACES"]:0 < 15) - NetworkConfig::Config["WAIT_FOR_INTERFACES"] = 15; - */ - if(alias == "") { newdev["_aliases"] = aliases; y2milestone("aliases %1", aliases); @@ -1264,7 +1106,6 @@ y2error("Unknown operation: %1", operation); return false; } -// nm_name_old = nil; modified = true; operation = nil; return true; @@ -1404,30 +1245,6 @@ } else { // this is the first interface, match the hardware with install.inf -/* - // couldn't happen - if (size(InstallInf)>0){ - // Select the one from install.inf with the same MAC - // find H["mac"] == InstallInf["hwaddr"] - if (tosel == nil ) { - string hwaddr = InstallInf["hwaddr"]:""; - if(hwaddr != nil && hwaddr != "") { - tosel = find (map h, Hardware, ``( h["mac"]:"" == hwaddr )); - } - y2milestone("Rule: matching hwaddr in install.inf"); - } - - // Select the one from install.inf with the same module - // find H["module"] == InstallInf["module"] - if (tosel == nil) { - string infmodule = InstallInf["module"]:""; - if(infmodule != nil && infmodule != "") { - tosel = find (map h, Hardware, ``( h["module"]:"" == infmodule )); - } - y2milestone("Rule: matching module in install.inf"); - } - } else -*/ { /* No install.inf -> select the first connected */ // find H["active"] == true @@ -1496,9 +1313,6 @@ if (!hasAnyValue(type)) type = NetworkInterfaces::GetType(getCurrentItem()["ifcfg"]:""); device = getCurrentItem()["ifcfg"]:""; alias = NetworkInterfaces::alias_num(getCurrentItem()["ifcfg"]:""); -// nm_name = Items[current, "hwcfg"]:""; -// if (nm_name=="") nm_name_old = createHwcfgName(Items[current, "hwinfo"]:$[], type); -// NetworkModules::SelectM(nm_name); /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); @@ -1512,35 +1326,6 @@ if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1"); y2debug("type=%1", type); - /* kernel options */ - if(hotplug == "" && alias == "" && nm_name != "") { - // FIXME: MOD SelectModule(dev); -// NetworkModules::SelectM(nm_name); - } - else { - // FIXME: MOD SelectModule(""); -// NetworkModules::AddM(); - } - -/* - qeth_options = NetworkModules::QETH_OPTIONS; - chan_mode = NetworkModules::CCW_CHAN_MODE; - lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; - - if (NetworkModules::QETH_IPA_TAKEOVER == nil || - NetworkModules::QETH_IPA_TAKEOVER == "" || - NetworkModules::QETH_IPA_TAKEOVER == "0") - ipa_takeover = false; - else - ipa_takeover = true; - - if (NetworkModules::QETH_LAYER2_SUPPORT == nil || - NetworkModules::QETH_LAYER2_SUPPORT == "" || - NetworkModules::QETH_LAYER2_SUPPORT == "0") - qeth_layer2 = false; - else - qeth_layer2 = true; -*/ /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; @@ -1564,7 +1349,6 @@ } NetworkInterfaces::Add(); operation = `edit; -// interfacename=getCurrentItem()["hwinfo", "dev_name"]:""; Items[current, "ifcfg"]=getCurrentItem()["hwinfo", "dev_name"]:""; description = HardwareName([getCurrentItem()["hwinfo"]:$[]], getCurrentItem()["hwinfo", "dev_name"]:""); Commit (); @@ -1596,13 +1380,6 @@ case "qeth": case "hsi": string portnumber_param = (size(qeth_portnumber)>0) ? sformat("-n %1", qeth_portnumber) : ""; -/* - if (size(chan_mode)>0) - // chan_ids (read, write, control), port - command1=sformat("qeth_configure %1 -p %2 %3 %4 1", qeth_layer2?"-l":"", chan_mode, portnumber_param, qeth_chanids); - else - command1=sformat("qeth_configure %1 %2 %3 1", qeth_layer2?"-l":"", portnumber_param, qeth_chanids); -*/ string portname_param=(size(chan_mode)>0) ? sformat("-p %1", chan_mode) : ""; string options_param=(size(qeth_options)>0) ? sformat("-o %1", qeth_options) : ""; command1=sformat("qeth_configure %1 %2 %3 %4 %5 1", options_param, qeth_layer2?"-l":"", portname_param, portnumber_param, qeth_chanids); Modified: trunk/network/src/routines/summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/summary.ycp… ============================================================================== --- trunk/network/src/routines/summary.ycp (original) +++ trunk/network/src/routines/summary.ycp Mon Mar 2 14:58:43 2009 @@ -114,48 +114,6 @@ } -/* - list overviewdev = [ - `item(`id(0), "0", "ISDN", "ippp0", "Hisax ISDN"), - ]; - list overviewif = [ - `item(`id(0), "0", "ippp", "Contactel", "1.2.3.4", "4.3.2.1"), - `item(`id(1), "1", "ippp", "Czech Online", "1.2.3.6", "6.3.2.1"), - ]; - - y2debug("overviewdev=%1", overviewdev); - y2debug("overviewif=%1", overviewif); - - import "Wizard"; - import "Label"; - Wizard::CreateDialog(); - term contents = nil; - - contents = OverviewTable( - `header(_("No."), _("Type"), _("Device"), _("Hardware")), - overviewdev - ); - - Wizard::SetContentsButtons("Network cards configuration overview", contents, "helptext", - Label::BackButton(), Label::FinishButton()); - - UI::UserInput(); - - contents = OverviewTableDouble( - "ISDN devices", - `header(_("No."), _("Type"), _("Device"), _("Hardware")), - overviewdev, - "Providers", - `header(_("No."), _("Type"), _("Connection"), _("IP"), _("Remote IP")), - overviewif - ); - - Wizard::SetContentsButtons("ISDN configuration overview", contents, "helptext", - Label::BackButton(), Label::FinishButton()); - - UI::UserInput(); - -*/ /* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55846 - /trunk/storage/storage/src/include/custom_part_lib.ycp
by aschnell＠svn.opensuse.org 02 Mar '09

02 Mar '09

Author: aschnell Date: Mon Mar 2 14:13:34 2009 New Revision: 55846 URL: http://svn.opensuse.org/viewcvs/yast?rev=55846&view=rev Log: - removed function returning constant value Modified: trunk/storage/storage/src/include/custom_part_lib.ycp Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Mon Mar 2 14:13:34 2009 @@ -578,14 +578,6 @@ return( ret ); } -define boolean AskCryptPwd( map p ) - { - /* boolean ret = p["mount"]:""!="swap" || !EmptyCryptPwdAllowed(p); */ - boolean ret = true; - y2milestone( "AskCryptPwd ret:%1", ret ); - return( true ); - } - /** * Do all checks concerning handling of crypt fs @@ -604,8 +596,7 @@ new["enc_type"] = new["format"]:false?`luks:`twofish; else new["enc_type"] = `none; - if( crypt_fs && AskCryptPwd( new ) && - size(Storage::GetCryptPwd( new["device"]:"" ))==0 ) + if( crypt_fs && size(Storage::GetCryptPwd( new["device"]:"" ))==0 ) { boolean tmpc = EmptyCryptPwdAllowed( new ); string fs_passwd = DlgCreateCryptFs( new["device"]:"", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55845 - /tags/branch-SLE-10-SP3-2_13_124/network/
by mzugec＠svn.opensuse.org 02 Mar '09

02 Mar '09

Author: mzugec Date: Mon Mar 2 13:52:26 2009 New Revision: 55845 URL: http://svn.opensuse.org/viewcvs/yast?rev=55845&view=rev Log: Created tag branch-SLE-10-SP3-2_13_124 for network Added: tags/branch-SLE-10-SP3-2_13_124/network/ - copied from r55844, branches/SuSE-SLE-10-SP3-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55844 - /tags/branch-SLE-10-SP3-2_13_124/
by mzugec＠svn.opensuse.org 02 Mar '09

02 Mar '09

Author: mzugec Date: Mon Mar 2 13:52:22 2009 New Revision: 55844 URL: http://svn.opensuse.org/viewcvs/yast?rev=55844&view=rev Log: Created tag branch-SLE-10-SP3-2_13_124 Added: tags/branch-SLE-10-SP3-2_13_124/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55843 - in /branches/SuSE-SLE-10-SP3-Branch/network: VERSION package/yast2-network.changes src/lan/virtual.ycp
by mzugec＠svn.opensuse.org 02 Mar '09

02 Mar '09

Author: mzugec Date: Mon Mar 2 13:52:14 2009 New Revision: 55843 URL: http://svn.opensuse.org/viewcvs/yast?rev=55843&view=rev Log: possible to not use LABEL for aliases (bnc#471253) Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP3-Branch/network/src/lan/virtual.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/VERSION Mon Mar 2 13:52:14 2009 @@ -1 +1 @@ -2.13.123 +2.13.124 Modified: branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes Mon Mar 2 13:52:14 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 2 13:49:32 CET 2009 - mzugec(a)suse.de + +- possible to not use LABEL for aliases (bnc#471253) +- 2.14.124 + +------------------------------------------------------------------- Thu Feb 19 09:10:00 CET 2009 - mzugec(a)suse.cz - removed "no network running" popup, log only (bnc#475440) Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/lan/virtual.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/src/lan/virtual.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/src/lan/virtual.ycp Mon Mar 2 13:52:14 2009 @@ -90,7 +90,6 @@ /* Aliases dialog help 3/3, #83766 */ _("Do not include the interface name in the alias name. For example, enter foo instead of eth0:foo."); - integer items = 0; integer max = 0; list<term> table_items = []; @@ -98,14 +97,13 @@ maplist(string alias, map data, (map<string,map>) Lan::aliases, { string ipaddr = data["IPADDR"]:""; string netmask = data["NETMASK"]:""; - term item = `item(`id(items), alias, ipaddr, netmask); + string label = data["LABEL"]:""; + term item = `item(`id(size(table_items)), label, ipaddr, netmask); table_items = add(table_items, item); - items = items + 1; }); y2debug("table_items=%1", table_items); - y2debug("items=%1", items); - max = items; + max = size(table_items); /* Aliases dialog contents */ term contents = `HBox( @@ -144,13 +142,13 @@ Label::BackButton(), Label::OKButton()); UI::ChangeWidget(`id(`table), `Items, table_items); - if(items > 0) UI::SetFocus(`id(`table)); + if(size(table_items) > 0) UI::SetFocus(`id(`table)); any ret = nil; while(true) { - UI::ChangeWidget(`id(`edit), `Enabled, items > 0); - UI::ChangeWidget(`id(`delete), `Enabled, items > 0); + UI::ChangeWidget(`id(`edit), `Enabled, size(table_items) > 0); + UI::ChangeWidget(`id(`delete), `Enabled, size(table_items) > 0); ret = UI::UserInput(); y2milestone("ret=%1", ret); @@ -199,7 +197,6 @@ table_items = add(table_items, item); UI::ChangeWidget(`id(`table), `Items, table_items); UI::ChangeWidget(`id(`table), `CurrentItem, max); - items = items + 1; max = max + 1; continue; } @@ -216,7 +213,6 @@ return cur != e[0, 0]:nil; }); UI::ChangeWidget(`id(`table), `Items, table_items); - items = size(table_items); continue; } else if(ret == `back) { @@ -238,10 +234,11 @@ Lan::aliases = $[]; maplist(term e, table_items, { map alias = $[]; + if (size(e[1]:"")>0) alias["LABEL"]=e[1]:""; alias["IPADDR"] = e[2]:""; alias["NETMASK"] = e[3]:""; - Lan::aliases[e[1]:""] = alias; - aliases_to_delete[e[1]:""] = nil; + Lan::aliases[tostring(size(Lan::aliases))] = alias; +// aliases_to_delete[e[1]:""] = nil; }); foreach (string a, any v, (map <string, any>)aliases_to_delete, { if (v != nil) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55842 - /tags/branch-SLE-10-SP3-2_13_112/yast2/
by mzugec＠svn.opensuse.org 02 Mar '09

02 Mar '09

Author: mzugec Date: Mon Mar 2 13:49:26 2009 New Revision: 55842 URL: http://svn.opensuse.org/viewcvs/yast?rev=55842&view=rev Log: Created tag branch-SLE-10-SP3-2_13_112 for yast2 Added: tags/branch-SLE-10-SP3-2_13_112/yast2/ - copied from r55841, branches/SuSE-SLE-10-SP3-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55841 - /tags/branch-SLE-10-SP3-2_13_112/
by mzugec＠svn.opensuse.org 02 Mar '09

02 Mar '09

Author: mzugec Date: Mon Mar 2 13:49:23 2009 New Revision: 55841 URL: http://svn.opensuse.org/viewcvs/yast?rev=55841&view=rev Log: Created tag branch-SLE-10-SP3-2_13_112 Added: tags/branch-SLE-10-SP3-2_13_112/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55840 - in /branches/SuSE-SLE-10-SP3-Branch/yast2: VERSION library/network/src/NetworkDevices.ycp package/yast2.changes
by mzugec＠svn.opensuse.org 02 Mar '09

02 Mar '09

Author: mzugec Date: Mon Mar 2 13:49:15 2009 New Revision: 55840 URL: http://svn.opensuse.org/viewcvs/yast?rev=55840&view=rev Log: NetworkInterfaces - possible to not use LABEL for aliases (bnc#471253) Modified: branches/SuSE-SLE-10-SP3-Branch/yast2/VERSION branches/SuSE-SLE-10-SP3-Branch/yast2/library/network/src/NetworkDevices.ycp branches/SuSE-SLE-10-SP3-Branch/yast2/package/yast2.changes Modified: branches/SuSE-SLE-10-SP3-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/yast2/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/yast2/VERSION Mon Mar 2 13:49:15 2009 @@ -1 +1 @@ -2.13.111 +2.13.112 Modified: branches/SuSE-SLE-10-SP3-Branch/yast2/library/network/src/NetworkDevices.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/yast2/library/network/src/NetworkDevices.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/yast2/library/network/src/NetworkDevices.ycp Mon Mar 2 13:49:15 2009 @@ -662,18 +662,19 @@ // writing, but we create it in 2 ways so it's // better here. Actually it does not work because // the edit dialog nukes LABEL :-( - boolean seen_label = false; +// boolean seen_label = false; maplist(string ak, string av, amap, { string akk = ak + "_" + anum; ShellSafeWrite (topath (p + akk), av); - seen_label = seen_label || ak == "LABEL"; +// seen_label = seen_label || ak == "LABEL"; }); - +/* if (!seen_label) { ShellSafeWrite (topath (p + ("LABEL_" + anum)), anum); } +*/ }); } /* Write regular keys */ Modified: branches/SuSE-SLE-10-SP3-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/yast2/package/yast2.changes Mon Mar 2 13:49:15 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 2 13:48:12 CET 2009 - mzugec(a)suse.de + +- NetworkInterfaces - possible to not use LABEL for aliases +(bnc#471253) +- 2.13.112 + +------------------------------------------------------------------- Mon Apr 7 13:25:48 CEST 2008 - mvidner(a)suse.cz - nfs-client: do not truncate /etc/fstab starting at lines with -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55839 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/AutoinstPartition.ycp
by ug＠svn.opensuse.org 02 Mar '09

02 Mar '09

Author: ug Date: Mon Mar 2 13:45:40 2009 New Revision: 55839 URL: http://svn.opensuse.org/viewcvs/yast?rev=55839&view=rev Log: software RAID cloning fixed (bnc#480690) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstPartition.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon Mar 2 13:45:40 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Mar 2 13:44:23 CET 2009 - ug(a)suse.de + +- software RAID cloning fixed (bnc#480690) + +------------------------------------------------------------------- Wed Feb 25 17:08:20 CET 2009 - ug(a)suse.de - very old LVM and RAID code dropped Modified: trunk/autoinstallation/src/modules/AutoinstPartition.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstPartition.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstPartition.ycp Mon Mar 2 13:45:40 2009 @@ -43,6 +43,9 @@ "resize" : false, "lv_name" : "", "lvm_group" : "", + "raid_name" : "", + "raid_type" : "", + "raid_options" : $[] ]; define map<symbol,map> allfs = $[]; @@ -213,6 +216,13 @@ else if( "swap" == newPart["mount"]:"" ){ newPart = set( newPart, "partition_id", 130 ); } + if( haskey( part, "raid_name" ) ) { + newPart = set( newPart, "raid_name", part["raid_name"]:"" ); + newPart = set( newPart, "raid_type", part["raid_type"]:"raid0" ); + } + if( haskey( part, "raid_options" ) ) { + newPart = set( newPart, "raid_options", part["raid_options"]:$[] ); + } return newPart; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0