June 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r38238 - /tags/branch-SLE-10-SP1-2_13_193/
by locilka＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: locilka Date: Fri Jun 1 11:26:46 2007 New Revision: 38238 URL: http://svn.opensuse.org/viewcvs/yast?rev=38238&view=rev Log: Created tag branch-SLE-10-SP1-2_13_193 Added: tags/branch-SLE-10-SP1-2_13_193/ -- 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] r38237 - /tags/stable-2_15_39/network/
by mzugec＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: mzugec Date: Fri Jun 1 11:17:08 2007 New Revision: 38237 URL: http://svn.opensuse.org/viewcvs/yast?rev=38237&view=rev Log: Created tag stable-2_15_39 for network Added: tags/stable-2_15_39/network/ - copied from r38236, trunk/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] r38236 - /tags/stable-2_15_39/
by mzugec＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: mzugec Date: Fri Jun 1 11:17:07 2007 New Revision: 38236 URL: http://svn.opensuse.org/viewcvs/yast?rev=38236&view=rev Log: Created tag stable-2_15_39 Added: tags/stable-2_15_39/ -- 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] r38235 - in /trunk/network: ./ package/ src/clients/ src/lan/ src/modules/ src/routines/
by mzugec＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: mzugec Date: Fri Jun 1 11:16:46 2007 New Revision: 38235 URL: http://svn.opensuse.org/viewcvs/yast?rev=38235&view=rev Log: save_network.ycp moved from routines/ to clients/ Detection.ycp renamed to NetHwDetection.ycp NetworkStorage.ycp moved to yast2 package Added: trunk/network/src/clients/save_network.ycp trunk/network/src/modules/NetHwDetection.ycp - copied, changed from r38153, trunk/network/src/modules/Detection.ycp Removed: trunk/network/src/modules/Detection.ycp trunk/network/src/modules/NetworkStorage.ycp trunk/network/src/routines/save_network.ycp Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp trunk/network/src/modules/DNS.ycp trunk/network/src/modules/DSL.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/Routing.ycp trunk/network/src/routines/complex.ycp trunk/network/yast2-network.spec.in Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38235&r1=382… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Jun 1 11:16:46 2007 @@ -1 +1 @@ -2.15.38 +2.15.39 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Jun 1 11:16:46 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 1 11:14:21 CEST 2007 - mzugec(a)suse.cz + +- save_network.ycp moved from routines/ to clients/ +- Detection.ycp renamed to NetHwDetection.ycp +- NetworkStorage.ycp moved to yast2 package +- 2.15.39 + +------------------------------------------------------------------- Thu May 31 17:44:21 CEST 2007 - mzugec(a)suse.cz - merge code for select interfaces in InternetTest and Dsl (#117426) Added: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (added) +++ trunk/network/src/clients/save_network.ycp Fri Jun 1 11:16:46 2007 @@ -0,0 +1,392 @@ +/** + * File: clients/save_network.ycp + * Package: Network configuration + * Summary: Installation routines + * Authors: Michal Zugec <mzugec(a)suse.cz> + * + * $Id: save_network.ycp 38154 2007-05-28 08:20:39Z mzugec $ + * + */ + +{ + +textdomain "network"; + +import "Hostname"; +import "IP"; +import "NetworkDevices"; +import "FileUtils"; +import "Netmask"; +import "NetworkStorage"; +import "Installation"; +import "String"; + +map <string, any> InstallInf = $[]; + +// global variable because chrooted environment +boolean network_disk=false; + +/** + * Read one install.inf item + * @param item InstallInf map key + * @param var install.inf SCR variable + * @return true on success + */ +define boolean ReadInstallInfItem(path install_inf, string item, string var) { + if(item == nil || item == "" || var == nil || var == "") return false; + string val = (string) SCR::Read(add(install_inf, var)); +//y2internal("val %1 %2", item, val); + if(val == nil) return false; + if(val != "") InstallInf[item] = val; +//y2internal("%1", InstallInf); + return true; +} + +define string DeleteFirstWord (string s) { + string ret = regexpsub (s, "^[^ ]* +(.*)", "\\1"); + return (ret == nil)? s: ret; +} + +/** + * Read install.inf from the correct location + * @return true on success + */ +define boolean ReadInstallInf() { + + /* Detect install.inf location */ + path install_inf = nil; + if(SCR::Read(.target.size,"/etc/install.inf") > 0) { + install_inf = .etc.install_inf; + InstallInf["installation"] = "yes"; + } + /* FIXME + else if(SCR::Read(.target.size,"/var/lib/YaST2/install.inf") > 0) + install_inf = .var.lib.YaST2.install_inf; + */ + else + return false; + + /* Read install.inf items */ + ReadInstallInfItem(install_inf, "ipaddr", "IP"); + ReadInstallInfItem(install_inf, "netmask", "Netmask"); + ReadInstallInfItem(install_inf, "bcast", "Broadcast"); + ReadInstallInfItem(install_inf, "remote_ip", "Pointopoint"); + ReadInstallInfItem(install_inf, "mtu", "IP_MTU"); + ReadInstallInfItem(install_inf, "bootproto", "NetConfig"); + ReadInstallInfItem(install_inf, "netdevice", "Netdevice"); + ReadInstallInfItem(install_inf, "gateway", "Gateway"); + ReadInstallInfItem(install_inf, "nameserver", "Nameserver"); + ReadInstallInfItem(install_inf, "domain", "Domain"); + ReadInstallInfItem(install_inf, "hostname", "Hostname"); + ReadInstallInfItem(install_inf, "module", "Alias"); +// ReadInstallInfItem(install_inf, "options", "Options"); + ReadInstallInfItem(install_inf, "hwaddr", "HWAddr"); + ReadInstallInfItem(install_inf, "ethtool_options", "ethtool"); + ReadInstallInfItem(install_inf, "unique", "NetUniqueID"); + ReadInstallInfItem(install_inf, "connect_wait", "ConnectWait"); + + ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2"); + ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); + + /* Split network device */ + string netdevice = InstallInf["netdevice"]:""; + if(netdevice != "") { + string devtype = NetworkDevices::device_type(netdevice); + if(devtype != nil && devtype != "") InstallInf["type"] = devtype; +// InstallInf = remove(InstallInf, "netdevice"); + } + + /* Split FQ hostname */ + string hostname = InstallInf["hostname"]:""; + if(hostname != "" && !IP::Check (hostname)) { + list split = Hostname::SplitFQ(hostname); + InstallInf["hostname"] = split[0]:hostname; + InstallInf["domain"] = split[1]:""; + } + else + { + // do not have numeric hostname, #152218 + InstallInf["hostname"] = ""; + } + + // #180821, todo cleanup + if (netdevice != "") + { + string mod = (string) SCR::Read (add (.etc.install_inf_alias, netdevice)); + if (mod != "" && mod != nil) + { + InstallInf["module"] = mod; + string options = (string) SCR::Read (add (.etc.install_inf_options, mod)); + if (options != "" && options != nil) + { + InstallInf["options"] = options; + } + } + } + else + { + // FIXME: alias = eth0 tulip + // FIXME: options = ne io=0x200 + + // #42203: correctly parse module and options for proposal + // "eth0 qeth" -> "qeth" + // FIXME: this only works for a single module + string mod = InstallInf["module"]:""; + if (mod != "") { + InstallInf["module"] = DeleteFirstWord (mod); + } + string options = InstallInf["options"]:""; + if (options != "") { + InstallInf["options"] = DeleteFirstWord (options); + } + } + + y2milestone("InstallInf(%1)", InstallInf); + return true; +} + + +/** + * Read module options from /etc/install.inf + * @param module_name Module name + * @return module options, empty string if none + */ +string InstallModuleOptions(string module_name) { + if(SCR::Read(.target.size,"/etc/install.inf") > 0) { + list<string> modules = SCR::Dir(.etc.install_inf_options); + y2milestone("Module with options in /etc/install.inf: %1", modules); + if(contains(modules, module_name)) { + any options = SCR::Read (add (.etc.install_inf_options, module_name)); + if (options!=nil && options != "") + return (string)options; + } + } + return ""; +} + +map<string, any> getcfg(string options, string device){ + map <string, any> cfg=$[]; + map <string, any> output = (map <string, any>)SCR::Execute(.target.bash_output, + sformat("getcfg %1 %2", options, device)); +// if (output["exit"]:0==0){ + foreach(string row, splitstring(output["stdout"]:"", "\n"), { + row=deletechars(row, "\\\"\;"); + list<string> keyval=splitstring(row, "="); + if (size(keyval)>1) cfg[keyval[0]:""]=keyval[1]:""; + + }); +// } + y2milestone("%1 %2\n%3", options, device, cfg); + return cfg; +} + +string getHWFullPath(string hwfile){ + return sformat("%1/hwcfg-%2", "/etc/sysconfig/hardware", hwfile); +} + + +map <string,any> hwcfg=$[]; + +string CreateHardwareFile(){ + string hwfile=""; + + // read current hardware information and check if configuration file exists + hwcfg=getcfg("-f hwcfg- -d /etc/sysconfig/hardware", InstallInf["netdevice"]:""); + if( tointeger(hwcfg["HWD_CONFIG_N"]:"0")==0 ){ + y2internal("hwcfg doesn't exist"); + // check if deriver is connected to bus + if (tointeger(hwcfg["HWD_BUS_N"]:"0")>0){ + string busname = hwcfg[sformat("HWD_BUSNAME_%1", tointeger(hwcfg["HWD_BUS_N"]:"0")-1)]:""; + string busid = hwcfg[sformat("HWD_BUSID_%1", tointeger(hwcfg["HWD_BUS_N"]:"0")-1)]:""; + if (busname == "vio" && FileUtils::IsDirectory("/proc/iSeries")){ + // Bug 159652 - LTC22358 - no hwcfg-static files created for iseries_veth + hwfile = sformat("static-0"); + y2warning("vio bus type, using %1", hwfile); + } else { + hwfile = sformat("bus-%1-%2", busname, busid); + y2internal("will create hwcfg file %1", hwfile); + } + + } else { + hwfile = sformat("static-0"); + y2error("Not connected to bus! Using %1", hwfile); + } + string content=sformat("STARTMODE='auto'\nMODULE='%1'\nMODULE_OPTIONS='%2'\n", InstallInf["module"]:"", InstallInf["options"]:""); + y2internal ("creating %1 file\n%2", hwfile, content); + SCR::Write(.target.string, getHWFullPath(hwfile), content); + }else { + // in case of s390 hwcfg is created by Linuxrc (uli) + y2warning("hwcfg already exists"); + hwfile = hwcfg[sformat("HWD_CONFIG_%1", tointeger(hwcfg["HWD_CONFIG_N"]:"0")-1)]:""; + y2internal("configuration name = %1", hwfile); + } + y2internal("Hardware file: %1", getHWFullPath(hwfile)); + + return hwfile; +} + +string getIfcName(string hwfile){ + string ifcfg=""; + string interfacetype = NetworkDevices::device_type( hwcfg[sformat("HWD_INTERFACE_%1", tointeger(hwcfg["HWD_INTERFACE_N"]:"0")-1)]:"" ); + // for special s390 interface types write static configuration + if (contains(["qeth", "hsi", "ctc", "lcs", "iucv"], interfacetype)){ + y2internal("special device type %1", interfacetype); + ifcfg=sformat("ifcfg-%1", hwfile); + } else { + y2internal("usual type %1", interfacetype); + // if MAC available - use it for name + if (size(hwcfg["HWD_ID"]:"")>0){ + ifcfg = sformat("ifcfg-%1-id-%2", interfacetype, hwcfg["HWD_ID"]:""); + y2internal("MAC address available - use it for name %1", ifcfg); + } else { + // in case MAC is not available, use device name (eth0) + ifcfg = sformat("ifcfg-%1", hwcfg[sformat("HWD_INTERFACE_%1", tointeger(hwcfg["HWD_INTERFACE_N"]:"0")-1)]:""); + y2internal("MAC address not available - use device name %1", ifcfg); + } + } + y2internal("interface configuration file %1", ifcfg); + return ifcfg; +} + +void CreateIfcfg(string hwcfg, string ifcfg){ + string network_configuration=""; + // set BOOTPROTO=[ static | dhcp ] + if (InstallInf["bootproto"]:"dhcp"=="static") { + // add broadcast interface #suse49131 + network_configuration=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", + InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); + } else { + network_configuration="BOOTPROTO='dhcp'\n"; + // set DHCP_SET_HOSTNAME=yes #suse30528 + y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); + SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); + } + + // if available, write MTU + if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); + + + if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); + + if (size(InstallInf["unique"]:"")>0) + { + // write UNIQUE - #suse25739 + network_configuration = sformat("%1UNIQUE='%2'\n", network_configuration, InstallInf["unique"]:""); + // write UDI + list<map> cards=(list<map>)SCR::Read(.probe.netcard); + foreach(map card, cards, { + if (card["unique_key"]:""==InstallInf["unique"]:"") network_configuration = sformat("%1udi='%2'\n", network_configuration, card["udi"]:""); + }); + } + + if (network_disk){ network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); + } else{network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); + } + + // reference to hardware configuration + network_configuration = sformat("%1_nm_name='%2'\n", network_configuration, hwcfg); + + // point to point interface + if (size(InstallInf["remote_ip"]:"")>0)network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); + + + y2internal("Network Configuration:\n%1\n%2", network_configuration, ifcfg); + + // write only if file doesn't exists + string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); +// string dev_file=sformat("/tmp/%1", ifcfg); + if (!FileUtils::Exists(dev_file)) { + SCR::Write(.target.string, dev_file, network_configuration); + y2internal("ifcfg file: %1", dev_file); + } + else y2warning("File exists %1", dev_file); +} + +/* + * create all network files except ifcfg and hwcfg + * directly to installed system + */ + +void CreateOtherNetworkFiles(){ + // create routes file + if (size(InstallInf["gateway"]:"")>0){ + y2milestone("Writing route : %1", InstallInf["gateway"]:""); + SCR::Write(.target.string, "/etc/sysconfig/network/routes", InstallInf["gateway"]:""); + } else y2warning("No routing information in install.inf"); + + // create hostname + if (size(InstallInf["hostname"]:"")>0){ + y2milestone("Write HOSTANAME: %1", InstallInf["hostname"]:""); + SCR::Write(.target.string, "/etc/HOSTNAME", InstallInf["hostname"]:""); + } + + // create resolv.conf + if (size(InstallInf["domain"]:"")>0 && size(InstallInf["nameserver"]:"")>0){ + string text=sformat("domain %1 +nameserver %2", InstallInf["domain"]:"", InstallInf["nameserver"]:""); + y2milestone("Write resolv.conf content: %1", text); + SCR::Write(.target.string, "/etc/resolv.conf", text); + } + + // create defaultdomain + if (size(InstallInf["domain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ + y2milestone("Write defaultdomain: %1", InstallInf["domain"]:""); + SCR::Write(.target.string, "/etc/defaultdomain", InstallInf["domain"]:""); + } + + // write wait_for_interfaces if needed + if (size(InstallInf["connect_wait"]:"")>0){ + SCR::Execute(.target.bash_output, sformat("sed -i s/^WAIT_FOR_INTERFACES=.*/WAIT_FOR_INTERFACES=%1/g /etc/sysconfig/network/config", InstallInf["connect_wait"]:"")); + } +} + +/* + * this replaces bash script create_interface + */ +void save_network(){ + + // skip from chroot + integer old_SCR = WFM::SCRGetDefault (); + integer new_SCR = WFM::SCROpen ("chroot=/:scr", false); + WFM::SCRSetDefault (new_SCR); + + SCR::Execute(.target.bash, sformat("cp /etc/sysconfig/hardware/* %1/etc/sysconfig/hardware/ 2>/dev/null", Installation::destdir)); + + // when root is on nfs/iscsi set startmode=nfsroot #176804 + string device = NetworkStorage::getDevice( Installation::destdir ); + y2internal("%1 directory is on %2 device", Installation::destdir, device); + network_disk = NetworkStorage::isDiskOnNetwork( device ); + + // -------------------------------------------------------------- + // Copy DHCP client cache so that we can request the same IP (#43974). + WFM::Execute (.local.bash, sformat ( + "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", + "/var/lib/dhcpcd", + String::Quote (Installation::destdir))); + + // close and chroot back + WFM::SCRClose (new_SCR); + WFM::SCRSetDefault (old_SCR); + + if(ReadInstallInf()){ + string hwcfg = CreateHardwareFile(); + string ifcfg = getIfcName(hwcfg); + + CreateIfcfg(hwcfg, ifcfg); + CreateOtherNetworkFiles(); + + SCR::Execute(.target.bash, "chkconfig network on"); + + // if portmap running - start it after reboot + WFM::Execute (.local.bash, + "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap"); + + + } else + y2error("Error while reading install.inf!"); + +} + +save_network(); +/* EOF */ +} Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Fri Jun 1 11:16:46 2007 @@ -14,7 +14,7 @@ import "Arch"; import "CWM"; import "CWMTab"; -import "Detection"; +import "NetHwDetection"; import "IP"; import "Label"; import "Lan"; @@ -334,7 +334,7 @@ return false; } // validate duplication - if (Detection::DuplicateIP (ipa)) + if (NetHwDetection::DuplicateIP (ipa)) { UI::SetFocus(`ipaddr); /* Popup text */ Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Fri Jun 1 11:16:46 2007 @@ -15,7 +15,7 @@ module "DNS"; textdomain "network"; -import "Detection"; +import "NetHwDetection"; import "Host"; import "Hostname"; import "IP"; @@ -199,8 +199,8 @@ // detection if (hostname == "") { - hostname = Detection::result["HOSTNAME"]:""; - domain = Detection::result["DOMAIN"]:""; + hostname = NetHwDetection::result["HOSTNAME"]:""; + domain = NetHwDetection::result["DOMAIN"]:""; } // last resort if (hostname == "") @@ -399,7 +399,7 @@ } else { list<string> nslist = maplist(string ns, nameservers, { - string nss = Detection::ResolveIP(ns); + string nss = NetHwDetection::ResolveIP(ns); return (nss == "") ? ns : (ns + " (" + nss + ")"); }); Modified: trunk/network/src/modules/DSL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DSL.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DSL.ycp (original) +++ trunk/network/src/modules/DSL.ycp Fri Jun 1 11:16:46 2007 @@ -16,7 +16,7 @@ textdomain "network"; import "Confirm"; -import "Detection"; +import "NetHwDetection"; import "Lan"; import "NetworkDevices"; import "NetworkService"; @@ -160,7 +160,7 @@ /* Progress step 1/5 */ ProgressNextStage(_("Detecting DSL devices...")); - if(!Detection::running) Detection::Start(); + if(!NetHwDetection::running) NetHwDetection::Start(); Hardware = ReadHardware("dsl"); /* In case of capiadsl we can emulate the detection with the parameters @@ -256,7 +256,7 @@ ], [], ""); /* Stop the detection */ - if(Detection::running) Detection::Stop(); + if(NetHwDetection::running) NetHwDetection::Stop(); if(Abort()) return false; /* Progress step 1/7 */ 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 Fri Jun 1 11:16:46 2007 @@ -17,7 +17,7 @@ import "Arch"; import "DNS"; -import "Detection"; +import "NetHwDetection"; import "Host"; import "Hostname"; import "IP"; @@ -391,7 +391,7 @@ // Dont read hardware data in config mode if(!Mode::config ()) { - if(!Detection::running) Detection::Start(); + if(!NetHwDetection::running) NetHwDetection::Start(); Hardware = ReadHardware("netcard"); } @@ -500,7 +500,7 @@ global define boolean Write() { y2milestone("Writing configuration"); - if(!write_only && Detection::running) Detection::Stop(); + if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); /* Stop the detection */ if(!modified) { @@ -1073,7 +1073,7 @@ // defaults for a new device devmap = $[ "STARTMODE": "auto", // #115448, #156388 - "NETMASK": (Detection::result["NETMASK"]:"255.255.255.0"), // #31369 + "NETMASK": (NetHwDetection::result["NETMASK"]:"255.255.255.0"), // #31369 ]; string product_startmode = ProductFeatures::GetStringFeature ("network", "startmode"); if (contains (["auto", "ifplugd"], product_startmode)) @@ -1798,7 +1798,7 @@ // ethtool_options = InstallInf["ethtool_options"]:""; // #176804 - if (NetworkStorage::RootIsOnNetwork ("/")) + if (NetworkStorage::isDiskOnNetwork ( NetworkStorage::getDevice("/") )) { startmode = "nfsroot"; y2milestone ("startmode nfsroot"); Copied: trunk/network/src/modules/NetHwDetection.ycp (from r38153, trunk/network/src/modules/Detection.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/NetHwDetecti… ============================================================================== --- trunk/network/src/modules/Detection.ycp (original) +++ trunk/network/src/modules/NetHwDetection.ycp Fri Jun 1 11:16:46 2007 @@ -39,7 +39,7 @@ { -module "Detection"; +module "NetHwDetection"; textdomain "network"; import "Directory"; Modified: trunk/network/src/modules/Routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Routing.ycp?… ============================================================================== --- trunk/network/src/modules/Routing.ycp (original) +++ trunk/network/src/modules/Routing.ycp Fri Jun 1 11:16:46 2007 @@ -15,7 +15,7 @@ module "Routing"; textdomain "network"; -import "Detection"; +import "NetHwDetection"; import "NetworkDevices"; import "Map"; @@ -120,7 +120,7 @@ devices = NetworkDevices::List(""); if(Routes == []) { - ReadFromGateway (Detection::result["GATEWAY"]:""); + ReadFromGateway (NetHwDetection::result["GATEWAY"]:""); } return true; @@ -271,7 +271,7 @@ string summary = ""; string gw = GetGateway(); - string gwhost = Detection::ResolveIP(gw); + string gwhost = NetHwDetection::ResolveIP(gw); if(gwhost != "") gw = gw + " (" + gwhost + ")"; if(gw != "") { Modified: trunk/network/src/routines/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/complex.ycp… ============================================================================== --- trunk/network/src/routines/complex.ycp (original) +++ trunk/network/src/routines/complex.ycp Fri Jun 1 11:16:46 2007 @@ -12,7 +12,7 @@ textdomain "network"; -import "Detection"; +import "NetHwDetection"; import "HTML"; import "NetworkDevices"; import "Popup"; @@ -415,7 +415,7 @@ if(proto == "" || proto == "static" || proto == "none" || proto == nil) { string addr = devmap["IPADDR"]:""; - string host = Detection::ResolveIP (addr); + string host = NetHwDetection::ResolveIP (addr); string remip = devmap["REMOTE_IPADDR"]:""; if(addr == "" || addr == nil) /* Network card status */ Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?re… ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Fri Jun 1 11:16:46 2007 @@ -4,14 +4,15 @@ # should be required by devtools BuildRequires: pkgconfig perl-XML-Writer rpm BuildRequires: update-desktop-files -BuildRequires: yast2-devtools yast2-testsuite yast2 +BuildRequires: yast2-devtools yast2-testsuite BuildRequires: yast2-country BuildRequires: yast2-installation >= 2.15.27 +BuildRequires: yast2 >= 2.15.35 # String::Random # Linuxrc::display_ip # SuSEFirewall::IsInstalled -Requires: yast2 >= 2.15.15 +Requires: yast2 >= 2.15.35 Requires: sysconfig yast2-country yast2-packager PreReq: /bin/rm -- 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] r38234 - in /branches/SuSE-SLE-10-SP1-Branch/installation: VERSION package/yast2-installation.changes src/modules/AddOnProduct.ycp
by locilka＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: locilka Date: Fri Jun 1 11:14:19 2007 New Revision: 38234 URL: http://svn.opensuse.org/viewcvs/yast?rev=38234&view=rev Log: - Fixed Add-Ons for AutoYaST Export function to write PRODUCT content tag file into the "product" tag in AutoYaST profile (#276309). - 2.13.193 Modified: branches/SuSE-SLE-10-SP1-Branch/installation/VERSION branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP1-Branch/installation/src/modules/AddOnProduct.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/installation/VERSION Fri Jun 1 11:14:19 2007 @@ -1 +1 @@ -2.13.192 +2.13.193 Modified: branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/installation/package/yast2-installation.changes Fri Jun 1 11:14:19 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 1 11:05:30 CEST 2007 - locilka(a)suse.cz + +- Fixed Add-Ons for AutoYaST Export function to write PRODUCT + content tag file into the "product" tag in AutoYaST profile + (#276309). +- 2.13.193 + +------------------------------------------------------------------- Mon May 14 09:05:34 CEST 2007 - jsrain(a)suse.cz - Fixed Add-Ons in AutoYaST Write function to Integrate all Add-Ons Modified: branches/SuSE-SLE-10-SP1-Branch/installation/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/installation/src/modules/AddOnProduct.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/installation/src/modules/AddOnProduct.ycp Fri Jun 1 11:14:19 2007 @@ -31,6 +31,7 @@ import "ProductLicense"; import "FileUtils"; import "Directory"; +import "Installation"; // variables for installation with product /** @@ -1232,11 +1233,55 @@ } global map Export () { - list<map<string,any> > exp = maplist (map<string,any> p, add_on_products, { + // See bugzilla #276309 + + /* + * Returns map like this one + * + * <add-on> + * <add_on_products config:type="list"> + * <listentry> + * <media_url>ftp://server.name/.../</media_url> + * <product>NEEDS_TO_MATCH_"PRODUCT"_TAG_FROM_content_FILE!</product> + * <product_dir>/</product_dir> + * </listentry> + * ... + * </add_on_products> + * </add-on> + */ + + // Just to make sure everything is initialized properly + Pkg::TargetInitialize (Installation::destdir); + Pkg::TargetLoad(); + + // Get list of currently installed products + list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); + + list <map <string, any> > exp = maplist (map<string,any> p, add_on_products, { if (haskey (p, "media")) p = remove (p, "media"); + + y2milestone ("Fixing product: %1", p); + + // Try to match the product "display_name" or "short_name" + // with "product" of the exported Add-On + foreach (map<string,any> prod, products, { + y2milestone ("Trying... Product resolvable: %1", prod); + if (prod["display_name"]:"" == p["product"]:"___no_product_name_" + || prod["short_name"]:"" == p["product"]:"___no_product_name_") + { + y2milestone ("Passed"); + p["product"] = prod["name"]:""; + // We do not need further testing for this product + break; + } + }); + + y2milestone ("Product to save: %1", p); + return p; }); + return $[ "add_on_products" : exp, ]; -- 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] r38233 - in /trunk/kdump/src: Kdump.ycp dialogs.ycp uifunctions.ycp
by juhliarik＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: juhliarik Date: Fri Jun 1 10:06:33 2007 New Revision: 38233 URL: http://svn.opensuse.org/viewcvs/yast?rev=38233&view=rev Log: added info about disk partitions Modified: trunk/kdump/src/Kdump.ycp trunk/kdump/src/dialogs.ycp trunk/kdump/src/uifunctions.ycp Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=38233&r1… ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Fri Jun 1 10:06:33 2007 @@ -40,6 +40,8 @@ import "Summary"; import "Message"; import "BootCommon"; +import "Storage"; +import "Map"; /** * Prototypes @@ -56,6 +58,23 @@ global boolean proposal_valid = false; /** + * List of available partiotions + * + * list <string> + */ +global list <string> available_partitions =[]; + + +/** + * List of available partiotions + * without filesystem or with uknown + * + * list <string> + */ +global list <string> uknown_fs_partitions =[]; + + +/** * Write only, used during autoinstallation. * Don't run services and SuSEconfig, it's all done at one place. */ @@ -125,6 +144,67 @@ /** + * Read disk partitions + * + * @return boolean successfull + */ + +boolean ReadDiskPartitions () { + // get complete map from Storage module + map<string,map> tg = Storage::GetTargetMap(); + // extract only real disks from target map. + map<string,map> disks = filter( string k, map disk, tg, ``(disk["type"]:`CT_UNKNOWN==`CT_DISK)); + // extract only disks + list <string> list_of_disks = (list<string>) Map::Keys(disks); + //get a list of all partitions usable for data storage + list <string> list_disks = (list<string>) Map::Keys(disks); + + y2milestone("[kdump] (ReadDiskPartitions) ----------------Begin of ReadDiskPartitions ()--------------"); + y2milestone("[kdump] (ReadDiskPartitions) list of disks: %1", list_disks); + + list<map> data_parts = []; + foreach (string key, list_disks, { + data_parts = data_parts + filter( map p, disks[key,"partitions"]:[], ``(p["type"]:`primary!=`extended)); + }); + //list<map> data_parts = filter( map p, disks["/dev/sda","partitions"]:[], ``(p["type"]:`primary!=`extended)); + + //parse partiotions with uknown file system + list<map> unknown = []; + unknown = filter( map p, data_parts, ``(p["detected_fs"]:nil==`unknown)); + + + list<string> uknown_partitions = []; + if (size(unknown)>0) + uknown_partitions = maplist( map p, unknown, ``(p["device"]:"")); + y2milestone("[kdump] (ReadDiskPartitions) list of device names of partitions without filesystem: %1", uknown_partitions); + uknown_fs_partitions = uknown_partitions; + // get list of device names of partitions + list<string> parts = maplist( map p, data_parts, ``(p["device"]:"")); + + y2milestone("[kdump] (ReadDiskPartitions) list of device names of partitions: %1", parts); + + // get list of udev ids of partitions, need to prepend "/dev/disk/by-id/" + list<string> udevids = maplist( map p, data_parts, ``(p["udev_id",0]:"")); + + y2milestone("[kdump] (ReadDiskPartitions) list of udev ids of partitions: %1", udevids); + + + //combination name + uids to one list + integer i = 0; + //available_partitions = parts; + foreach (string key, udevids, { + string value = parts[i]:"" +" - " + udevids[i]:""; + available_partitions = available_partitions + value; + i= i+1; + }); + + y2milestone("[kdump] (ReadDiskPartitions) list of available partitions (name + uid): %1", available_partitions); + y2milestone("[kdump] (ReadDiskPartitions) ------------End of ReadDiskPartitions ()--------------------------"); + return true; +} + + +/** * Read current kdump configuration * * @return boolean successfull @@ -138,13 +218,9 @@ y2milestone("-------------KDUMP_SETTINGS-------------------"); y2milestone("kdump configuration has been read: %1", KDUMP_SETTINGS); y2milestone("---------------------------------------------"); - /* - boolean ret = BootCommon::Read(false); - map boot = BootCommon::Export(); - y2milestone("-------------BootCommon::Read-------------------"); - y2milestone("BootCommon::bootloader_attribs : %1", boot); - y2milestone("---------------------------------------------"); - */ + + + return true; } @@ -164,7 +240,7 @@ /* Progress stage 1/2 */ _("Read the config file"), /* Progress stage 2/2 */ - _("Read another settings"), + _("Read disk partitions"), ], [ /* Progress step 1/2 */ _("Reading the config file..."), @@ -185,7 +261,7 @@ if(Abort()) return false; Progress::NextStep(); /* Error message */ - if(false) Report::Error(_("Cannot read another settings.")); + if(!ReadDiskPartitions ()) Report::Error(_("Cannot read disk partitions.")); sleep(sl); if(Abort()) return false; Modified: trunk/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/dialogs.ycp?rev=38233&… ============================================================================== --- trunk/kdump/src/dialogs.ycp (original) +++ trunk/kdump/src/dialogs.ycp Fri Jun 1 10:06:33 2007 @@ -90,7 +90,19 @@ "help" : HelpKdump("RunLevel"), ], - "EnableReboot" : $[ + "RawDisk" : $[ + //TRANSLATORS: ComboBox Label + "label" : _("&The list of available paritions without any filesystem"), + "widget" : `combobox, + "items" : [ + ], + "init" : InitRawDisk, + //"handle" : + //"store" : StoreRunLevel, + "help" : HelpKdump("RawDisk"), + ], + + "EnableReboot" : $[ //TRANSLATORS: CheckBox Label "label" : _("&Enable Immediate Reboot After Saving the Core"), "widget" : `checkbox, @@ -146,8 +158,8 @@ "custom_widget" : `VBox( `Frame(_("Saving Target for kdump Image"),`HBox(`HSpacing(1),`VBox( `RadioButtonGroup(`id("DumpTarget"), `VBox( - `Left(`RadioButton(`id("local_filesystem"), `opt(`notify), "&Local Filesytem", true)), - `Left(`RadioButton(`id("raw_disk"), `opt(`notify), "Raw Dis&k")), + `Left(`RadioButton(`id("local_filesystem"), `opt(`notify), "&Local Filesytem")), + //`Left(`RadioButton(`id("raw_disk"), `opt(`notify), "Raw Dis&k")), `Left(`RadioButton(`id("network"), `opt(`notify), "Net&work")) )) @@ -158,7 +170,7 @@ `ReplacePoint(`id("Targets"), ftp), `VStretch() ), - //"init" : + "init" : InitTargetKdump, "handle" : HandleTargetKdump, //"store" : "help" : HelpKdump("TargetKdump"), @@ -332,13 +344,19 @@ `Left("RunLevel"), `HStretch () ))), + + `VSpacing(1), + `Frame ( _("Saving temporary to raw partition"),`HBox(`HSpacing(1),`VBox( + `Left("RawDisk"), + `HStretch () + ))), `VStretch () ), "caption" : _("Kdump Expert Settings"), "tree_item_label" : _("Expert Settings"), "widget_names" : [ "DisBackButton","KdumpCommandLine", - "SwitchKdumpComLine", "RunLevel", + "SwitchKdumpComLine", "RunLevel", "RawDisk", ] ], Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=38… ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Fri Jun 1 10:06:33 2007 @@ -54,7 +54,7 @@ term local_filesystem = `VBox( `Frame(_("Local Filesystem"),`HBox(`HSpacing(1),`VBox( - `Left(`ComboBox(`id("local_partitions"), "&Select Partition", local_partitions_list)), + `Left(`ComboBox(`id("local_partitions"), "&The list of available paritions of all disks with filesystem")), `Left(`HBox( `TextEntry(`id("dir_save_image"), _("&Directory for Saving Dumps")), `VBox ( `Label(""), @@ -65,19 +65,6 @@ ); -term raw_disk = `VBox( - `Frame(_("Raw Disk"),`HBox(`HSpacing(1),`VBox( - `Left(`ComboBox(`id("raw_partitions"), "&Select Partition", raw_partitions_list)), - `Left(`HBox( - `TextEntry(`id("dir_save_image"), _("&Directory for Saving Dumps")), - `VBox ( `Label(""), - `PushButton ( `id ("select_dir_image"), `opt ( `hstretch ), _("B&rowse")) - ))) - ))) - -); - - term network = `VBox( `VSpacing(1), `Frame(_("Network"),`HBox(`HSpacing(1), @@ -148,17 +135,33 @@ + + +/** + * Function initializes option "Kdump Command Line" + * or "Kdump Command Line Append" + */ + +void InitTargetKdump (string key) { + UI::ReplaceWidget (`id ("Network"), `Empty()); + UI::ReplaceWidget (`id ("Targets"), local_filesystem); + UI::ChangeWidget(`id("local_partitions"), `Items, Kdump::available_partitions); + y2milestone("[kdump] (InitTargetKdump) Kdump::available_partitions %1", Kdump::available_partitions); +} + +/** + * Function handles "Saving Target for kdump Image" + * + */ + symbol HandleTargetKdump (string key, map event) { any radiobutton = UI::QueryWidget(`id("DumpTarget"), `CurrentButton); if (radiobutton == "local_filesystem") { UI::ReplaceWidget (`id ("Network"), `Empty()); UI::ReplaceWidget (`id ("Targets"), local_filesystem); + UI::ChangeWidget(`id("local_partitions"), `Items, Kdump::available_partitions); set_network = false; - } else if (radiobutton == "raw_disk") { - UI::ReplaceWidget (`id ("Network"), `Empty()); - UI::ReplaceWidget (`id ("Targets"), raw_disk); - set_network = false; } else if (radiobutton == "network") { UI::ReplaceWidget (`id ("Targets"), `Empty()); if (!set_network) @@ -438,8 +441,22 @@ +/** + * Function initializes option + * "RawDisk" + */ +void InitRawDisk (string key) { + if (size(Kdump::uknown_fs_partitions)>0) { + UI::ChangeWidget(`id("RawDisk"), `Items, Kdump::uknown_fs_partitions); + } else { + UI::ChangeWidget(`id("RawDisk"), `Enabled, false); + } + + +} + -- 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] r38232 - /tags/stable-2_15_35/yast2/
by mzugec＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: mzugec Date: Fri Jun 1 09:52:59 2007 New Revision: 38232 URL: http://svn.opensuse.org/viewcvs/yast?rev=38232&view=rev Log: Created tag stable-2_15_35 for yast2 Added: tags/stable-2_15_35/yast2/ - copied from r38231, trunk/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] r38231 - in /trunk/yast2: VERSION library/network/src/Makefile.am library/network/src/NetworkService.ycp library/network/src/NetworkStorage.ycp package/yast2.changes
by mzugec＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: mzugec Date: Fri Jun 1 09:52:51 2007 New Revision: 38231 URL: http://svn.opensuse.org/viewcvs/yast?rev=38231&view=rev Log: add function NetworkService::isNetworkRunning() NetworkStorage moved here from yast2-network Added: trunk/yast2/library/network/src/NetworkStorage.ycp Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/Makefile.am trunk/yast2/library/network/src/NetworkService.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=38231&r1=38230… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Jun 1 09:52:51 2007 @@ -1 +1 @@ -2.15.34 +2.15.35 Modified: trunk/yast2/library/network/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Makefi… ============================================================================== --- trunk/yast2/library/network/src/Makefile.am (original) +++ trunk/yast2/library/network/src/Makefile.am Fri Jun 1 09:52:51 2007 @@ -11,6 +11,7 @@ NetworkDevices.ycp \ NetworkPopup.ycp \ NetworkService.ycp \ + NetworkStorage.ycp \ SuSEFirewall.ycp \ SuSEFirewallServices.ycp \ SuSEFirewallExpertRules.ycp \ Modified: trunk/yast2/library/network/src/NetworkService.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkService.ycp (original) +++ trunk/yast2/library/network/src/NetworkService.ycp Fri Jun 1 09:52:51 2007 @@ -128,5 +128,19 @@ } } + +global boolean isNetworkRunning(){ + map output = (map)SCR::Execute(.target.bash_output, + "([ $(ip addr|grep -v '127.0.0.1'|grep -c inet) != '0' ] && echo 'network') || echo 'no net'"); + if (issubstring(output["stdout"]:"", "network")) { + y2milestone ("Network is running ..."); + return true; + } else { + y2milestone("Network is not running ..."); + return false; + } + +} + /* EOF */ } Added: trunk/yast2/library/network/src/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkStorage.ycp (added) +++ trunk/yast2/library/network/src/NetworkStorage.ycp Fri Jun 1 09:52:51 2007 @@ -0,0 +1,44 @@ +/** + * File: modules/NetworkStorage.ycp + * Package: Network configuration + * Summary: Networked disks + * Authors: Martin Vidner <mvidner(a)suse.cz> + * + * $Id: NetworkStorage.ycp 38154 2007-05-28 08:20:39Z mzugec $ + * + * #176804 - Root on iSCSI installation fails + */ + +{ + +module "NetworkStorage"; + +global string getDevice(string mount_point){ + map out = (map)SCR::Execute(.target.bash_output, sformat("grep ' %1 ' /proc/mounts|grep -v rootfs|cut -d' ' -f1|tr -d '\n'", mount_point)); + string device=deletechars(out["stdout"]:"", "1234567890"); + y2internal("%1", device); + return device; +} + +/** + * If the disk is on a networked device (NFS, ISCSI), + * the main NIC needs STARTMODE nfsroot instead of auto. + * @return root dev over network + */ +global boolean isDiskOnNetwork(string device){ + boolean ret=false; + foreach(map<string, any> disk, (list<map<string, any> >)SCR::Read(.probe.disk), { + y2milestone("%1", disk["dev_name"]:""); +y2internal("%1", device); + if (disk["dev_name"]:""==device){ + foreach(string row, disk["dev_names"]:[], { + if (issubstring(row, "iscsi")) ret=true; + }); + } + }); + return ret; +} + + +/* EOF */ +} Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jun 1 09:52:51 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 1 09:51:24 CEST 2007 - mzugec(a)suse.cz + +- add function NetworkService::isNetworkRunning() +- NetworkStorage moved here from yast2-network +- 2.15.35 + +------------------------------------------------------------------- Wed May 30 13:48:27 CEST 2007 - sh(a)suse.de - Fixed bug #278790: save_y2logs complains about missing RPM DB -- 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] r38230 - /tags/branch-SLE-10-SP1-2_13_4/product-creator/
by lslezak＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: lslezak Date: Fri Jun 1 08:10:42 2007 New Revision: 38230 URL: http://svn.opensuse.org/viewcvs/yast?rev=38230&view=rev Log: Created tag branch-SLE-10-SP1-2_13_4 for product-creator Added: tags/branch-SLE-10-SP1-2_13_4/product-creator/ - copied from r38229, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- 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] r38229 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/ProductCreator.ycp src/complex.ycp src/dialogs.ycp src/wizards.ycp
by lslezak＠svn.opensuse.org 01 Jun '07

01 Jun '07

Author: lslezak Date: Fri Jun 1 08:10:24 2007 New Revision: 38229 URL: http://svn.opensuse.org/viewcvs/yast?rev=38229&view=rev Log: - if the product is not bootable do not create /boot directory, skip isolinux.cfg configuration and display a warning message (#278731) - update directory.yast in /media.1 directory - display error message when a configured source is not found - 2.13.4 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Fri Jun 1 08:10:24 2007 @@ -1 +1 @@ -2.13.3 +2.13.4 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Fri Jun 1 08:10:24 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu May 31 14:33:51 CEST 2007 - lslezak(a)suse.cz + +- if the product is not bootable do not create /boot directory, + skip isolinux.cfg configuration and display a warning message + (#278731) +- update directory.yast in /media.1 directory +- display error message when a configured source is not found +- 2.13.4 + +------------------------------------------------------------------- Wed May 30 13:28:51 CEST 2007 - jsuchome(a)suse.cz - select the boot image automaticaly, according to the base product Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Fri Jun 1 08:10:24 2007 @@ -1015,6 +1015,18 @@ } +global boolean isBootSource(integer srcid) +{ + boolean bootable = false; + y2milestone("Downloading boot/directory.yast from src %1...", srcid); + string local_directory_yast = Pkg::SourceProvideOptionalFile(srcid, 1, "/boot/directory.yast"); + + bootable = local_directory_yast != nil; + y2milestone("Source %1 bootable: %2, directory.yast: %3", srcid, bootable, local_directory_yast); + + return bootable; +} + /** * Create Skeleton * @return boolean true on success @@ -1036,7 +1048,14 @@ skel_root = sformat("%1/%2", Config["iso-directory"]:"", Config["name"]:""); SCR::Execute(.target.mkdir, skel_root); - Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(arch))); + // detect the base source + integer base_source = checkProductDependency(); + boolean bootable_product = isBootSource(base_source); + + if (bootable_product) + { + Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(arch))); + } list<integer> enabled = Pkg::SourceGetCurrent(true); if (size(enabled) == 0 ) @@ -1046,26 +1065,27 @@ string descrDir = ""; string dataDir = ""; - if (Arch::i386() || Arch::x86_64()) + if (bootable_product) { - if (Config["code10"]:false) + if (Arch::i386() || Arch::x86_64()) { - Exec(sformat("/bin/mkdir -p '%1/boot/%2/loader'", String::Quote(skel_root), String::Quote(arch))); + if (Config["code10"]:false) + { + Exec(sformat("/bin/mkdir -p '%1/boot/%2/loader'", String::Quote(skel_root), String::Quote(arch))); + } + else + { + Exec(sformat("/bin/mkdir -p '%1/boot/loader'", String::Quote(skel_root))); + } } - else + else if (Arch::ppc() || Arch::ppc64()) { - Exec(sformat("/bin/mkdir -p '%1/boot/loader'", String::Quote(skel_root))); + Exec(sformat("/bin/mkdir -p '%1/etc'", String::Quote(skel_root))); + Exec(sformat("/bin/mkdir -p '%1/ppc'", String::Quote(skel_root))); + Exec(sformat("/bin/mkdir -p '%1/suseboot'", String::Quote(skel_root))); } } - else if (Arch::ppc() || Arch::ppc64()) - { - Exec(sformat("/bin/mkdir -p '%1/etc'", String::Quote(skel_root))); - Exec(sformat("/bin/mkdir -p '%1/ppc'", String::Quote(skel_root))); - Exec(sformat("/bin/mkdir -p '%1/suseboot'", String::Quote(skel_root))); - } - // detect the base source - integer base_source = checkProductDependency(); product_map = CreateProductDirectoryMap(base_source); // create directories for the addons @@ -1111,59 +1131,61 @@ dataDir = this_source["productData", "datadir"]:"suse"; y2debug("source data: %1", this_source["sourceData", "url"]:"" ); // Service Pack - if (savespace) + if (bootable_product) { - // Installation, rescue images - if (Config["code10"]:false) - { - CopyFile(id, 1, sformat("boot/%1/rescue", arch), - sformat("%1/boot/%2", skel_root, arch)); - } - else - { - // use the old directory - CopyFile(id, 1, "boot/rescue", sformat("%1/boot", skel_root)); - } - // Loader, x86 specific - if (Arch::i386() || Arch::x86_64()) + if (savespace) { + // Installation, rescue images if (Config["code10"]:false) { - // recursive copy of /boot/$arch/loader/* - CopyDirectoryRec(id, 1, sformat("boot/%1/loader", arch), sformat("%1/boot/%2", skel_root, arch)); - - // nonrecursive copy of /boot/$arch/* - CopyDirectoryNonRec(id, 1, sformat("boot/%1", arch), sformat("%1/boot", skel_root)); + CopyFile(id, 1, sformat("boot/%1/rescue", arch), + sformat("%1/boot/%2", skel_root, arch)); } else { - // recursive copy of /boot/loader/* - CopyDirectoryRec(id, 1, "boot/loader", sformat("%1/boot", skel_root)); + // use the old directory + CopyFile(id, 1, "boot/rescue", sformat("%1/boot", skel_root)); + } + // Loader, x86 specific + if (Arch::i386() || Arch::x86_64()) + { + if (Config["code10"]:false) + { + // recursive copy of /boot/$arch/loader/* + CopyDirectoryRec(id, 1, sformat("boot/%1/loader", arch), sformat("%1/boot/%2", skel_root, arch)); + + // nonrecursive copy of /boot/$arch/* + CopyDirectoryNonRec(id, 1, sformat("boot/%1", arch), sformat("%1/boot", skel_root)); + } + else + { + // recursive copy of /boot/loader/* + CopyDirectoryRec(id, 1, "boot/loader", sformat("%1/boot", skel_root)); + } + } + else if (Arch::ppc() || Arch::ppc64()) + { + // recursive copy of /boot + CopyDirectoryRec(id, 1, "boot", skel_root); + CopyPPCBoot(id, skel_root); + } else + { + CopyDirectoryRec(id, 1, "boot", skel_root); } } - else if (Arch::ppc() || Arch::ppc64()) - { - // recursive copy of /boot - CopyDirectoryRec(id, 1, "boot", skel_root); - CopyPPCBoot(id, skel_root); - } else + else { CopyDirectoryRec(id, 1, "boot", skel_root); - } - } - else - { - CopyDirectoryRec(id, 1, "boot", skel_root); - if (Arch::ppc() || Arch::ppc64()) - { - CopyPPCBoot(id, skel_root); + if (Arch::ppc() || Arch::ppc64()) + { + CopyPPCBoot(id, skel_root); + } } - } - - // copy the driver update - CopyOptionalFile(id, 1, "driverupdate", skel_root); + // copy the driver update + CopyOptionalFile(id, 1, "driverupdate", skel_root); + } // copy the descr directory Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(descrDir))); @@ -1193,17 +1215,20 @@ if (savespace) { - // Installation, rescue images - if (Config["code10"]:false) - { - CopyFile(id, 1, sformat("boot/%1/rescue", arch), sformat("%1/boot/%2", skel_root, arch)); - CopyFile(id, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch)); - CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch)); - } - else + if (bootable_product) { - CopyFile(id, 1, "boot/rescue", sformat("%1/boot", skel_root)); - CopyFile(id, 1, "boot/root", sformat("%1/boot", skel_root)); + // Installation, rescue images + if (Config["code10"]:false) + { + CopyFile(id, 1, sformat("boot/%1/rescue", arch), sformat("%1/boot/%2", skel_root, arch)); + CopyFile(id, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch)); + CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch)); + } + else + { + CopyFile(id, 1, "boot/rescue", sformat("%1/boot", skel_root)); + CopyFile(id, 1, "boot/root", sformat("%1/boot", skel_root)); + } } // copy content* files @@ -1213,14 +1238,17 @@ } else { - if (Config["code10"]:false) - { - CopyFile(id, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch)); - CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch)); - } - else + if (bootable_product) { - CopyFile(id, 1, "boot/root", sformat("%1/boot", skel_root)); + if (Config["code10"]:false) + { + CopyFile(id, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch)); + CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch)); + } + else + { + CopyFile(id, 1, "boot/root", sformat("%1/boot", skel_root)); + } } // copy base files, skip all directories @@ -1271,48 +1299,51 @@ } } - if (savespace) + if (bootable_product) { - // Installation, rescue images - if (Config["code10"]:false) - { - CopyFile(base_source, 1, sformat("boot/%1/rescue", arch), sformat("%1/boot/%2", skel_root, arch)); - CopyFile(base_source, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch)); - CopyFile(base_source, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch)); - } - else - { - CopyFile(base_source, 1, "boot/rescue", sformat("%1/boot", skel_root)); - CopyFile(base_source, 1, "boot/root", sformat("%1/boot", skel_root)); - } - - // Loader, x86 specific - if (Arch::i386() || Arch::x86_64()) + if (savespace) { + // Installation, rescue images if (Config["code10"]:false) { - // recursive copy of /boot/$arch/loader/* - CopyDirectoryRec(base_source, 1, sformat("boot/%1/loader", arch), sformat("%1/boot/%2", skel_root, arch)); + CopyFile(base_source, 1, sformat("boot/%1/rescue", arch), sformat("%1/boot/%2", skel_root, arch)); + CopyFile(base_source, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch)); + CopyFile(base_source, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch)); + } + else + { + CopyFile(base_source, 1, "boot/rescue", sformat("%1/boot", skel_root)); + CopyFile(base_source, 1, "boot/root", sformat("%1/boot", skel_root)); + } + + // Loader, x86 specific + if (Arch::i386() || Arch::x86_64()) + { + if (Config["code10"]:false) + { + // recursive copy of /boot/$arch/loader/* + CopyDirectoryRec(base_source, 1, sformat("boot/%1/loader", arch), sformat("%1/boot/%2", skel_root, arch)); - // nonrecursive copy of /boot/$arch/* - CopyDirectoryNonRec(base_source, 1, sformat("boot/%1", arch), sformat("%1/boot", skel_root)); + // nonrecursive copy of /boot/$arch/* + CopyDirectoryNonRec(base_source, 1, sformat("boot/%1", arch), sformat("%1/boot", skel_root)); + } + else + { + // recursive copy of /boot/loader/* + CopyDirectoryRec(base_source, 1, "boot/loader", sformat("%1/boot", skel_root)); + } } else { // recursive copy of /boot/loader/* - CopyDirectoryRec(base_source, 1, "boot/loader", sformat("%1/boot", skel_root)); + CopyDirectoryRec(base_source, 1, "boot", skel_root); } } else { - // recursive copy of /boot/loader/* - CopyDirectoryRec(base_source, 1, "boot", skel_root); + CopyDirectoryRec(base_source, 1, "/boot", skel_root); } } - else - { - CopyDirectoryRec(base_source, 1, "/boot", skel_root); - } } foreach(integer source_id, enabled, ``{ @@ -1359,8 +1390,11 @@ else { y2milestone("Slideshow is missing"); - Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); - Exec(sformat("> '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(slidedir))); + if (bootable_product) + { + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("> '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(slidedir))); + } } } else @@ -1649,11 +1683,9 @@ { // update directory.yast file // FIXME string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(dir)); - string command = sformat("/bin/rm -f '%1/directory.yast'; cd '%1'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/directory.yast'", String::Quote(dir)); - y2milestone("Updating %1/directory.yast ...", dir); - integer updated = (integer)SCR::Execute(.target.bash, command); - y2milestone("Updated: %1", updated == 0); - success = success && updated == 0; + y2milestone("Updating directory.yast ..."); + success = success && Exec(sformat("/bin/rm -f '%1/directory.yast'; cd '%1'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/directory.yast'", String::Quote(dir))); + success = success && Exec(sformat("/bin/rm -f '%1/directory.yast'; cd '%1'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/directory.yast'", String::Quote(dir + "/media.1"))); } return success; @@ -1765,7 +1797,37 @@ return true; } +global boolean CheckUnavailableSources() +{ + list<integer> selected_items = UrlToId(Config["sources"]:[]); + + // remove not found sources (with id = -1) + selected_items = filter(integer source_id, selected_items, {return source_id > 0;}); + + // were all sources found? + if (size(Config["sources"]:[]) != size(selected_items)) + { + list<string> not_found_sources = []; + + // get list of missing sources + foreach(string selected_url, ProductCreator::Config["sources"]:[], + { + list<integer> url_id = ProductCreator::UrlToId([selected_url]); + + if (url_id[0]:nil == -1) + { + not_found_sources = add(not_found_sources, selected_url); + } + } + ); + + // error message, %1 is list of URLs (one URL per line) + Report::LongError(sformat(_("These sources were not found:\n%1"), mergestring(not_found_sources, "\n"))); + return false; + } + return true; +} /** * Enable source and get source meta data Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp Fri Jun 1 08:10:24 2007 @@ -461,6 +461,12 @@ CommandLine::PrintVerbose(_("Enabling sources...")); success = ProductCreator::EnableSource(); + if (!success) + { + ProductCreator::CheckUnavailableSources(); + return `overview; + } + Progress::NextStage(); CommandLine::PrintVerbose(_("Selecting packages...")); success = ProductCreator::setPackages(); @@ -509,6 +515,23 @@ return (symbol)ret; } + symbol CheckBootableSrc() + { + integer base_src = ProductCreator::checkProductDependency(); + if (!ProductCreator::isBootSource(base_src)) + { + y2milestone("Base source %1 is not bootable, skipping isolinux.cfg configuration", base_src); + return `skip_isolinux; + } + + if (ProductCreator::Config["profile"]:""!="") + { + return `autoyast; + } + + return `next; + } + /* EOF */ } Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp Fri Jun 1 08:10:24 2007 @@ -477,10 +477,16 @@ list<integer> selected_items = ProductCreator::UrlToId(ProductCreator::Config["sources"]:[]); + // remove not found sources (with id = -1) + selected_items = filter(integer source_id, selected_items, {return source_id > 0;}); + foreach(integer i, selected_items, { UI::ChangeWidget(`id(`table), `Item(i, 0) , _("X")); }); + // report unavailbale sources if any + ProductCreator::CheckUnavailableSources(); + any ret = nil; @@ -582,7 +588,17 @@ Report::Error(_("Select at least one source.")); continue; } - ProductCreator::checkProductDependency(); + integer base_source = ProductCreator::checkProductDependency(); + + // is the base source bootable? + if (!ProductCreator::isBootSource(base_source)) + { + if (Popup::ContinueCancel("The selected installation source doesn't contain /boot directory. +The created medium will not be bootable.\n")) + { + break; + } + } break; } else if( ret == `back) { Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Fri Jun 1 08:10:24 2007 @@ -32,6 +32,7 @@ "source" : ``( sourceDialog() ), "config1" : ``( Configure1Dialog() ), "config2" : ``( Configure2Dialog() ), + "isolinuxcheck" : ``( CheckBootableSrc() ), "isolinux" : ``( isolinuxDialog() ), "packagemanager": ``( packageSelector() ), "gpgkey" : ``( gpgKeyDialog() ), @@ -52,7 +53,12 @@ ], "config2" : $[ `abort : `abort, - `next : "isolinux" + `next : "isolinuxcheck" + ], + "isolinuxcheck" : $[ + `next : "isolinux", + `skip_isolinux : "packagemanager", + `autoyast : "gpgkey" ], "isolinux": $[ `abort : `abort, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0