[yast-commit] r38154 - in /trunk/network: ./ package/ src/installation/ src/modules/ src/routines/ testsuite/tests/

Author: mzugec Date: Mon May 28 10:20:39 2007 New Revision: 38154 URL: http://svn.opensuse.org/viewcvs/yast?rev=38154&view=rev Log: installation network changes: http://lists.opensuse.org/yast-devel/2007-05/msg00025.html Added: trunk/network/src/routines/save_network.ycp - copied, changed from r37972, trunk/network/src/routines/install.ycp Removed: trunk/network/src/installation/inst_netsetup.ycp trunk/network/src/routines/install.ycp trunk/network/testsuite/tests/install.ycp Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/installation/Makefile.am trunk/network/src/modules/Lan.ycp trunk/network/src/modules/NetworkStorage.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38154&r1=38153&r2=38154&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon May 28 10:20:39 2007 @@ -1 +1 @@ -2.15.33 +2.15.34 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=38154&r1=38153&r2=38154&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 28 10:20:39 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 28 10:20:08 CEST 2007 - mzugec@suse.cz + +- installation network changes: +http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.34 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain@suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/network/src/installation/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/Makefile.am?rev=38154&r1=38153&r2=38154&view=diff ============================================================================== --- trunk/network/src/installation/Makefile.am (original) +++ trunk/network/src/installation/Makefile.am Mon May 28 10:20:39 2007 @@ -8,7 +8,7 @@ client_DATA = inst_ask_net_test.ycp inst_do_net_test.ycp \ inst_hostname.ycp \ - inst_netprobe.ycp inst_netsetup.ycp + inst_netprobe.ycp EXTRA_DIST = $(ynclude_DATA) $(client_DATA) $(ybin_SCRIPTS) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=38154&r1=38153&r2=38154&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon May 28 10:20:39 2007 @@ -189,11 +189,6 @@ // FIXME: MOD list<string> DeletedModules = []; /** - * /etc/install.inf data - */ -map InstallInf = $[]; - -/** * Data was modified? */ boolean modified = false; @@ -312,7 +307,7 @@ } include "network/hardware.ycp"; -include "network/install.ycp"; +//include "network/install.ycp"; include "network/routines.ycp"; include "network/runtime.ycp"; @@ -439,7 +434,7 @@ if(Abort()) return false; /* Progress step 7/9 */ ProgressNextStage(_("Reading installation information...")); - ReadInstallInf(); +// ReadInstallInf(); sleep(sl); if(Abort()) return false; @@ -1559,9 +1554,10 @@ } 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 */ + // Select the one from install.inf with the same MAC // find H["mac"] == InstallInf["hwaddr"] if (tosel == nil ) { string hwaddr = InstallInf["hwaddr"]:""; @@ -1571,7 +1567,7 @@ y2milestone("Rule: matching hwaddr in install.inf"); } - /* Select the one from install.inf with the same module */ + // Select the one from install.inf with the same module // find H["module"] == InstallInf["module"] if (tosel == nil) { string infmodule = InstallInf["module"]:""; @@ -1580,7 +1576,9 @@ } y2milestone("Rule: matching module in install.inf"); } - } else{ + } else +*/ + { /* No install.inf -> select the first connected */ // find H["active"] == true if (tosel == nil) { @@ -1675,7 +1673,7 @@ global define boolean ProposeInterfaces () { y2milestone("Hardware=%1", Hardware); - y2milestone("InstallInf=%1", InstallInf); +// y2milestone("InstallInf=%1", InstallInf); y2milestone("NetworkConfig::Config=%1", NetworkConfig::Config); y2milestone("NetworkConfig::DHCP=%1", NetworkConfig::DHCP); @@ -1710,7 +1708,7 @@ /* Some HW found -> use it for proposal */ if(size(Hardware) > 0) { if (Arch::s390()){ - tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); +// tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); } else tosel = FindMatchingDevice($[]); @@ -1720,6 +1718,7 @@ y2debug("Hardware=%1", Hardware); y2milestone ("Selected HW w/o install.inf patches: %1", tosel); +/* // do not select a card without a driver, #29296 if (tosel != nil) { @@ -1736,12 +1735,12 @@ // 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"]:""); @@ -1755,9 +1754,9 @@ // 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 */ + // Nothing detected -> use InstallInf + else if(size(InstallInf) > 0) { if(!haskey(InstallInf, "module")) { @@ -1775,10 +1774,12 @@ type = InstallInf["type"]:"eth"; device = NetworkDevices::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. @@ -1788,24 +1789,24 @@ SetDefaultsForHW (); // #145041 - ethtool_options = InstallInf["ethtool_options"]:""; +// ethtool_options = InstallInf["ethtool_options"]:""; // #176804 - if (NetworkStorage::RootIsOnNetwork ()) + if (NetworkStorage::RootIsOnNetwork ("/")) { startmode = "nfsroot"; y2milestone ("startmode nfsroot"); } - ipaddr = InstallInf["ipaddr"]:""; - bootproto = InstallInf["bootproto"]:"static"; +// ipaddr = InstallInf["ipaddr"]:""; +// bootproto = InstallInf["bootproto"]:"static"; y2debug("ipaddr,bootproto=%1,%2", ipaddr, bootproto); if(bootproto == "static" && ipaddr != "" && ipaddr != nil) { y2milestone("static proposal"); /* propose address setup from /etc/install.inf */ - netmask = InstallInf["netmask"]:""; +// netmask = InstallInf["netmask"]:""; if(netmask == nil || netmask == "") netmask = "255.255.255.0"; } @@ -1854,12 +1855,13 @@ 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 */ + // try to get hostname from the network string hnent = Detection::ResolveIP(ipaddr); //last resort - generate random hostname (#165269) @@ -1876,7 +1878,7 @@ } } - +*/ return true; } @@ -1887,10 +1889,10 @@ global define boolean ProposeRoutesAndResolver () { if(bootproto == "static" && ipaddr != "" && ipaddr != nil) { /* propose default gateway from /etc/install.inf */ - Routing::ReadFromGateway (InstallInf["gateway"]:""); +// Routing::ReadFromGateway (InstallInf["gateway"]:""); /* propose DNS setup from /etc/install.inf */ - DNS::ReadNameserver (InstallInf["nameserver"]:""); +// DNS::ReadNameserver (InstallInf["nameserver"]:""); ProposeHostname (); } return true; @@ -1946,6 +1948,7 @@ SelectHWMap(tosel); } /* Nothing detected -> use InstallInf */ +/* else if(size(InstallInf) > 0) { if(!haskey(InstallInf, "module")) { @@ -1955,9 +1958,10 @@ NetworkModules::Alias = InstallInf["module"]:""; NetworkModules::Options = InstallInf["options"]:""; - type = InstallInf["type"]:"eth"; +// type = InstallInf["type"]:"eth"; device = NetworkDevices::GetFreeDevice(type); } +*/ else { y2milestone("No hardware, no install.inf -> no autoinstallation possible."); return false; @@ -1990,7 +1994,7 @@ } Commit(); }); - } + } else { y2milestone ("no interface configuration, taking it from install.inf"); @@ -2002,12 +2006,12 @@ if (autoinstall_settings["routing", "routes"]:[] == []) { y2milestone ("gateway from install.inf"); - Routing::ReadFromGateway (InstallInf["gateway"]:""); +// Routing::ReadFromGateway (InstallInf["gateway"]:""); } if (autoinstall_settings["dns", "nameservers"]:[] == []) { y2milestone ("nameserver from install.inf"); - DNS::ReadNameserver (InstallInf["nameserver"]:""); +// DNS::ReadNameserver (InstallInf["nameserver"]:""); } if (autoinstall_settings["dns", "hostname"]:"" == "") { @@ -2037,7 +2041,7 @@ global define list<map> PrepareForAutoinst() { - ReadInstallInf(); +// ReadInstallInf(); Hardware = ReadHardware("netcard"); return Hardware; } Modified: trunk/network/src/modules/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/NetworkStorage.ycp?rev=38154&r1=38153&r2=38154&view=diff ============================================================================== --- trunk/network/src/modules/NetworkStorage.ycp (original) +++ trunk/network/src/modules/NetworkStorage.ycp Mon May 28 10:20:39 2007 @@ -13,16 +13,37 @@ 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; +} + +global boolean isDiskOnNetwork(string device){ + boolean ret=false; + foreach(map disk, (list >)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; +} + /** * If the root is on a networked device (NFS, ISCSI), * the main NIC needs STARTMODE nfsroot instead of auto. * @return root dev over network */ -global boolean RootIsOnNetwork () { +global boolean RootIsOnNetwork (string root) { // in create_interface script there is similar code (if some changes needed, don't forget check also that file) // in case that parameter "root=..." is not defined (read from /proc/cmdline) say that device is NOT network - string iscsi_cmd = " - ROOT_DISK=$(grep ' / ' /proc/mounts|grep -v rootfs|cut -d' ' -f1); + string iscsi_cmd = sformat(" + ROOT_DISK=$(grep ' %1 ' /proc/mounts|grep -v rootfs|cut -d' ' -f1); if [ -n \"$(echo $ROOT_DISK|grep 'by-id\\|by-uuid\\|by-path\\|by-label')\" ] then echo by-id or by-UUID or by-path or by-label @@ -32,7 +53,6 @@ ROOTPART=${ROOT_DISK##*/} fi - echo ROOTPART=\"$ROOTPART\" # use * and .. to get to the device containing ROOTPART case `cd -P /sys/block/*/\"$ROOTPART\"/../device && pwd` in *session*) @@ -41,7 +61,7 @@ IS_ISCSI=false ;; esac $IS_ISCSI -"; +", root); map out = (map) SCR::Execute (.target.bash_output, iscsi_cmd); y2milestone ("%1", out); return out["exit"]:-1 == 0; Copied: trunk/network/src/routines/save_network.ycp (from r37972, trunk/network/src/routines/install.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/save_network.ycp?p2=trunk/network/src/routines/save_network.ycp&p1=trunk/network/src/routines/install.ycp&r1=37972&r2=38154&rev=38154&view=diff ============================================================================== --- trunk/network/src/routines/install.ycp (original) +++ trunk/network/src/routines/save_network.ycp Mon May 28 10:20:39 2007 @@ -16,6 +16,16 @@ import "Hostname"; import "IP"; import "NetworkDevices"; +import "FileUtils"; +import "Netmask"; +import "NetworkStorage"; +import "Installation"; +import "String"; + +map InstallInf = $[]; + +// global variable because chrooted environment +boolean network_disk=false; /** * Read one install.inf item @@ -26,8 +36,10 @@ 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; } @@ -42,8 +54,6 @@ */ define boolean ReadInstallInf() { - InstallInf = $[]; - /* Detect install.inf location */ path install_inf = nil; if(SCR::Read(.target.size,"/etc/install.inf") > 0) { @@ -60,15 +70,21 @@ /* 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, "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"); @@ -77,9 +93,8 @@ string netdevice = InstallInf["netdevice"]:""; if(netdevice != "") { string devtype = NetworkDevices::device_type(netdevice); - if(devtype != nil && devtype != "") - InstallInf["type"] = devtype; - InstallInf = remove(InstallInf, "netdevice"); + if(devtype != nil && devtype != "") InstallInf["type"] = devtype; +// InstallInf = remove(InstallInf, "netdevice"); } /* Split FQ hostname */ @@ -150,6 +165,229 @@ return ""; } +map getcfg(string options, string device){ + map cfg=$[]; + map output = (map )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 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 */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org