Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at Mon Nov 16 18:37:05 CET 2009. -------- --- yast2-network/yast2-network.changes 2009-10-29 17:49:03.000000000 +0100 +++ yast2-network/yast2-network.changes 2009-11-13 17:04:35.000000000 +0100 @@ -1,0 +2,47 @@ +Fri Nov 13 17:01:09 CET 2009 - mzugec@suse.de + +- adapt interfaces into bridge with 0.0.0.0/32 (bnc#547327) +- 2.18.60 + +------------------------------------------------------------------- +Wed Nov 11 20:45:22 CET 2009 - mzugec@suse.cz + +- install broadcom for b43-pci-bridge driver (bnc#412248) +- 2.18.59 + +------------------------------------------------------------------- +Tue Nov 10 15:50:05 CET 2009 - mzugec@suse.cz + +- replace kinternet dependency with qinternet (bnc#549912) +- 2.18.58 + +------------------------------------------------------------------- +Mon Nov 9 15:20:50 CET 2009 - mzugec@suse.de + +- allow VLAN into bridge (bnc#530109) +- 2.18.57 + +------------------------------------------------------------------- +Mon Nov 9 14:53:52 CET 2009 - mzugec@suse.de + +- allow physical identification only when edit device + +------------------------------------------------------------------- +Mon Nov 9 14:14:37 CET 2009 - mzugec@suse.cz + +- adapted test for xen bridged network (bnc#553794) +- 2.18.56 + +------------------------------------------------------------------- +Wed Nov 4 16:17:18 CET 2009 - mzugec@suse.cz + +- lan module in 1st stage (FaTE#303069) +- 2.18.55 + +------------------------------------------------------------------- +Tue Nov 3 15:32:18 CET 2009 - mzugec@suse.cz + +- support for ETHTOOL_OPTIONS (FaTE#305352) +- 2.18.54 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-network-2.18.53.tar.bz2 New: ---- yast2-network-2.18.60.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.aiFhzv/_old 2009-11-16 18:35:48.000000000 +0100 +++ /var/tmp/diff_new_pack.aiFhzv/_new 2009-11-16 18:35:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.18.53) +# spec file for package yast2-network (Version 2.18.60) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-network -Version: 2.18.53 +Version: 2.18.60 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.18.53.tar.bz2 +Source0: yast2-network-2.18.60.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -65,7 +65,7 @@ This package contains autogenerated documentation for yast2-network %prep -%setup -n yast2-network-2.18.53 +%setup -n yast2-network-2.18.60 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-network-2.18.53.tar.bz2 -> yast2-network-2.18.60.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/VERSION new/yast2-network-2.18.60/VERSION --- old/yast2-network-2.18.53/VERSION 2009-10-29 17:04:43.000000000 +0100 +++ new/yast2-network-2.18.60/VERSION 2009-11-13 12:38:41.000000000 +0100 @@ -1 +1 @@ -2.18.53 +2.18.60 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/clients/save_network.ycp new/yast2-network-2.18.60/src/clients/save_network.ycp --- old/yast2-network-2.18.53/src/clients/save_network.ycp 2009-10-26 15:37:19.000000000 +0100 +++ new/yast2-network-2.18.60/src/clients/save_network.ycp 2009-11-04 16:20:08.000000000 +0100 @@ -78,6 +78,7 @@ return false; /* Read install.inf items */ + ReadInstallInfItem(install_inf, "firststage_network", "ConfigureNetwork"); ReadInstallInfItem(install_inf, "ipaddr", "IP"); ReadInstallInfItem(install_inf, "ipaddr6", "IP6"); ReadInstallInfItem(install_inf, "netmask", "Netmask"); @@ -399,6 +400,53 @@ } } +void CopyConfiguredNetworkFiles(){ + y2milestone("Copy network configuration files from 1st stage into installed system"); + string sysconfig = "/etc/sysconfig/network/"; + string copy_to = String::Quote (sformat("%1%2", Installation::destdir, sysconfig)); + + // just copy files + foreach(string file, ["ifcfg-*", "routes"], { + string copy_from = String::Quote (sformat("%1%2", sysconfig, file)); + y2milestone("Copy %1 into %2", copy_from, copy_to); + string cmd = sformat("cp %1 %2", copy_from, copy_to); + y2internal("cml %1:%2", cmd, SCR::Execute(.target.bash_output, cmd)); + }); + + // merge files with default installed by sysconfig + foreach(string file, ["dhcp", "config"], { + string source_file = sformat("%1%2", sysconfig, file); + string dest_file = sformat("%1%2", copy_to, file); + + // apply options from initrd configuration files into installed system + // i.e. just modify (not replace) files from sysconfig rpm + string cmd2 = " +for row in $(grep -v \"^[[:space:]]*#\" $source_file) + do + option=$(echo $row|sed s/\"^[[:space:]]$row\"/\"$row\"/g) + key=${option%*=*} + grep -v \"^[[:space:]]*#\" $dest_file | grep -q $key + if [ $? != \"0\" ] + then + echo $option >> $dest_file + else + sed -i s/\"^[[:space:]]*$key.*\"/\"$option\"/g $dest_file + fi + done"; + + string cmd1 = sformat("source_file=%1;dest_file=%2 +", source_file, dest_file); + + // merge commands (add file-path variables) because of some sformat limits with % character + string command=sformat("%1%2", cmd1, cmd2); + y2milestone("Execute file merging script : %1", SCR::Execute(.target.bash_output, command)); + + }); +//FIXME: proxy +} + + + /* * this replaces bash script create_interface */ @@ -445,8 +493,8 @@ string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir); string net_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, net_srcfile); -y2internal("udev_rules_destdir %1", udev_rules_destdir); -y2internal("net_destfile %1", net_destfile); + y2milestone("udev_rules_destdir %1", udev_rules_destdir); + y2milestone("net_destfile %1", net_destfile); //Do not create udev_rules_destdir if it already exists (in case of update) //(bug #293366, c#7) @@ -465,6 +513,16 @@ } else y2internal("file %1 exists", net_destfile); + boolean install_inf = ReadInstallInf(); + boolean configure_network = false; + if (install_inf){ + configure_network = (InstallInf["firststage_network"]:"0"=="1"); + if(configure_network){ + CopyConfiguredNetworkFiles(); + } + } else + y2error("Error while reading install.inf!"); + // close and chroot back WFM::SCRSetDefault (old_SCR); WFM::SCRClose (new_SCR); @@ -474,12 +532,14 @@ } - if(ReadInstallInf()){ + if(install_inf){ // string hwcfgname = CreateHardwareFile(); // string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - CreateIfcfg(); - CreateOtherNetworkFiles(); + if (!configure_network){ + CreateIfcfg(); + CreateOtherNetworkFiles(); + } SCR::Execute(.target.bash, "chkconfig network on"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/lan/bridge.ycp new/yast2-network-2.18.60/src/lan/bridge.ycp --- old/yast2-network-2.18.53/src/lan/bridge.ycp 2009-08-31 15:48:04.000000000 +0200 +++ new/yast2-network-2.18.60/src/lan/bridge.ycp 2009-11-13 16:57:19.000000000 +0100 @@ -23,7 +23,8 @@ // from all configured netcards filter 0.0.0.0 configurations map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { - if (contains(["br", "vlan"], devtype)) continue; +// if (contains(["br", "vlan"], devtype)) continue; + if (contains(["br"], devtype)) continue; if (contains(["tun", "tap"], devtype)) { foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { string description = NetworkInterfaces::GetDevTypeDescription(devtype, true); @@ -72,18 +73,22 @@ } if (((string)configurations[NetworkInterfaces::GetType(device), device, "PREFIXLEN"]:"" != "32") || ((string)configurations[NetworkInterfaces::GetType(device), device, "NETMASK"]:"" != "255.255.255.255")) - if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0") { + if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0" && (string)configurations[NetworkInterfaces::GetType(device), device, "BOOTPROTO"]:"" != "none") { if(!confirmed) { valid = Popup::ContinueCancel(_("At least one selected device is already configured. -Remove the configuration? +Adapt the configuration for bridge (IP addess 0.0.0.0/32)? ")); confirmed=true; } if (valid) { integer i = LanItems::current; if (LanItems::FindAndSelect(device)) { - y2internal("delete %1", device); - LanItems::DeleteItem(); + y2internal("Adapt device %1 for bridge (0.0.0.0/32)", device); + NetworkInterfaces::Edit(device); + NetworkInterfaces::Current["IPADDR"]="0.0.0.0"; + NetworkInterfaces::Current["PREFIXLEN"]="32"; + NetworkInterfaces::Current["BOOTPROTO"]="static"; + NetworkInterfaces::Commit(); NetworkInterfaces::Add(); LanItems::current = i; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/lan/complex.ycp new/yast2-network-2.18.60/src/lan/complex.ycp --- old/yast2-network-2.18.53/src/lan/complex.ycp 2009-05-18 08:09:12.000000000 +0200 +++ new/yast2-network-2.18.60/src/lan/complex.ycp 2009-11-10 15:50:56.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Summary, overview and IO dialogs for network cards config * Authors: Michal Svec <msvec@suse.cz> * - * $Id: complex.ycp 57221 2009-05-17 20:11:45Z mzugec $ + * $Id: complex.ycp 59466 2009-11-10 14:50:55Z mzugec $ */ { @@ -140,7 +140,7 @@ // this is one of 3 places to install packages :-( // - kernel modules (InstallKernel): before loaded - // - smpppd & kinternet: before net start + // - smpppd & qinternet: before net start // - wlan firmware: here, just because it is copied from modems // #45960 if(LanItems::Requires != [] && LanItems::Requires != nil) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/lan/hardware.ycp new/yast2-network-2.18.60/src/lan/hardware.ycp --- old/yast2-network-2.18.53/src/lan/hardware.ycp 2009-10-29 17:48:17.000000000 +0100 +++ new/yast2-network-2.18.60/src/lan/hardware.ycp 2009-11-09 15:52:36.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Hardware dialogs * Authors: Michal Svec <msvec@suse.cz> * - * $Id: hardware.ycp 59245 2009-10-29 16:48:16Z mzugec $ + * $Id: hardware.ycp 59421 2009-11-09 13:54:27Z mzugec $ */ { @@ -51,6 +51,9 @@ _("<p>Additionally, you may specify <b>Options</b> for the Kernel module. Use this format: <i>option</i>=<i>value</i>. Each entry should be space separated,for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are configured with the same module name, options will be merged while saving.</p> +") + + +_("<p>If you write something into <b>Ethtool options</b>, ifup will call ethtool with this options.</p> "); if(!(LanItems::operation == `edit || Arch::s390 ())) @@ -127,6 +130,7 @@ hardware["no_hotplug"] = hardware["hotplug"]:"" == ""; hardware["no_hotplug_dummy"] = hardware["no_hotplug"]:false && hardware["type"]:"" != "dummy"; + hardware["ethtool_options"] = LanItems::ethtool_options; } @@ -213,11 +217,20 @@ ) ); + term EthtoolWidget = + `Frame(_("Ethtool options"), + `HBox( + `InputField(`id(`ethtool_opts), `opt(`hstretch), _("Options"), hardware["ethtool_options"]:"") + ) + + ); + term contents = `VBox( - `HBox(UdevWidget,`HStretch(), BlinkCard), + `HBox(UdevWidget,`HStretch(), (LanItems::operation==`edit) ? BlinkCard : `Empty()), TypeNameWidgets, KernelBox, + EthtoolWidget, `VStretch() ); @@ -521,6 +534,7 @@ string driver = (string) UI::QueryWidget(`modul, `Value); LanItems::setDriver(driver); LanItems::driver_options[driver] = (string) UI::QueryWidget(`options, `Value); + LanItems::ethtool_options = (string) UI::QueryWidget(`ethtool_opts, `Value); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/lan/wizards.ycp new/yast2-network-2.18.60/src/lan/wizards.ycp --- old/yast2-network-2.18.53/src/lan/wizards.ycp 2009-10-26 15:37:19.000000000 +0100 +++ new/yast2-network-2.18.60/src/lan/wizards.ycp 2009-11-04 16:18:49.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network cards configuration wizards * Authors: Michal Svec <msvec@suse.cz> * - * $Id: wizards.ycp 55832 2009-03-02 08:26:52Z mzugec $ + * $Id: wizards.ycp 59295 2009-11-04 15:18:48Z mzugec $ */ { @@ -35,7 +35,7 @@ * Whole configuration of network * @return successfully finished */ -boolean LanSequence() { +symbol LanSequence() { map aliases = $[ "read" : [ ``( ReadDialog() ), true ], @@ -70,7 +70,7 @@ symbol ret = Sequencer::Run(aliases, sequence); UI::CloseDialog(); - return ret == `next; + return ret; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/modem/complex.ycp new/yast2-network-2.18.60/src/modem/complex.ycp --- old/yast2-network-2.18.53/src/modem/complex.ycp 2009-02-23 13:48:46.000000000 +0100 +++ new/yast2-network-2.18.60/src/modem/complex.ycp 2009-11-10 15:50:56.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Summary, overview and IO dialogs for modems configuration. * Authors: Michal Svec <msvec@suse.cz> * - * $Id: complex.ycp 54989 2009-01-26 09:53:41Z mzugec $ + * $Id: complex.ycp 59466 2009-11-10 14:50:55Z mzugec $ */ { @@ -86,7 +86,7 @@ // warning message when modem module starts up and NM is on string warning = _("NetworkManager is enabled. Some features, such as multiple providers for one modem, will not work. -You may want to use kinternet instead."); +You may want to use qinternet instead."); Popup::LongWarning (warning); } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/modules/ISDN.ycp new/yast2-network-2.18.60/src/modules/ISDN.ycp --- old/yast2-network-2.18.53/src/modules/ISDN.ycp 2009-01-16 16:56:13.000000000 +0100 +++ new/yast2-network-2.18.60/src/modules/ISDN.ycp 2009-11-10 15:50:56.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec@suse.cz> * Karsten Keil <kkeil@suse.de> * - * $Id: ISDN.ycp 54715 2009-01-16 15:56:12Z mzugec $ + * $Id: ISDN.ycp 59466 2009-11-10 14:50:55Z mzugec $ * * Representation of the configuration of ISDN. * Input and output routines. @@ -346,8 +346,8 @@ */ global define boolean Write(boolean start) ``{ - // install kinternet if there is at least one ISDN device - #161782 - if (size(Devices["contr"]:$[])>0 && !PackageSystem::Installed("kinternet")) installpackages = add (installpackages, "kinternet"); + // install qinternet if there is at least one ISDN device - #161782 + if (size(Devices["contr"]:$[])>0 && !PackageSystem::Installed("qinternet")) installpackages = add (installpackages, "qinternet"); if (installpackages != nil && installpackages != [""]) { symbol retp = PackagesInstall((list<string>) installpackages); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/modules/Lan.ycp new/yast2-network-2.18.60/src/modules/Lan.ycp --- old/yast2-network-2.18.53/src/modules/Lan.ycp 2009-10-20 11:29:06.000000000 +0200 +++ new/yast2-network-2.18.60/src/modules/Lan.ycp 2009-11-13 17:03:39.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec@suse.cz> * - * $Id: Lan.ycp 59104 2009-10-20 09:29:05Z mzugec $ + * $Id: Lan.ycp 59540 2009-11-13 16:03:22Z mzugec $ * * Representation of the configuration of network cards. * Input and output routines. @@ -273,6 +273,9 @@ if(Abort()) return false; LanItems::modified = false; initialized = true; + + Progress::Finish(); + return true; } @@ -498,6 +501,8 @@ ProgressNextStage(_("Finished")); sleep(sl); + Progress::Finish(); + if(Abort()) return false; return true; } @@ -1158,8 +1163,8 @@ * @return whether xenbr* exists */ global define boolean HaveXenBridge () { - // changed xen bridge detection (bnc#375606) - boolean have_br = FileUtils::Exists("/dev/shm/sysconfig/xenbridges"); + //adapted test for xen bridged network (bnc#553794) + boolean have_br = FileUtils::Exists("/dev/.sysconfig/network/xenbridges"); y2milestone ("Have Xen bridge: %1", have_br); return have_br; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/modules/LanItems.ycp new/yast2-network-2.18.60/src/modules/LanItems.ycp --- old/yast2-network-2.18.53/src/modules/LanItems.ycp 2009-10-26 16:00:11.000000000 +0100 +++ new/yast2-network-2.18.60/src/modules/LanItems.ycp 2009-11-12 09:05:53.000000000 +0100 @@ -163,6 +163,7 @@ "iwl3945" : "iwl3945-ucode", "iwl4965" : "iwl4965-ucode", "b43" : "b43-fwcutter", + "b43-pci-bridge" : "b43-fwcutter", "rt73usb" : "ralink-firmware", "rt61pci" : "ralink-firmware", "bcm43xx" : "", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/routines/routines.ycp new/yast2-network-2.18.60/src/routines/routines.ycp --- old/yast2-network-2.18.53/src/routines/routines.ycp 2009-05-28 16:46:36.000000000 +0200 +++ new/yast2-network-2.18.60/src/routines/routines.ycp 2009-11-13 17:03:53.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Miscellaneous routines * Authors: Michal Svec <msvec@suse.cz> * - * $Id: routines.ycp 56723 2009-04-09 12:17:37Z mzugec $ + * $Id: routines.ycp 59494 2009-11-11 20:01:12Z mzugec $ */ { @@ -632,6 +632,8 @@ one["requires"] = card["requires"]:[]; one["modalias"] = card["modalias"]:""; one["unique"] = card["unique_key"]:""; + // driver option needs for (bnc#412248) + one["driver"] = card["driver"]:""; // Each card remembers its position in the list of _all_ cards. // It is used when selecting the card from the list of _unconfigured_ // ones (which may be smaller). #102945. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/routines/runtime.ycp new/yast2-network-2.18.60/src/routines/runtime.ycp --- old/yast2-network-2.18.53/src/routines/runtime.ycp 2008-11-14 13:14:43.000000000 +0100 +++ new/yast2-network-2.18.60/src/routines/runtime.ycp 2009-11-10 15:50:56.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Runtime routines * Authors: Michal Svec <msvec@suse.cz> * - * $Id: runtime.ycp 53227 2008-11-12 15:55:11Z mzugec $ + * $Id: runtime.ycp 59466 2009-11-10 14:50:55Z mzugec $ */ { @@ -61,7 +61,7 @@ } /** - * Are there interfaces controlled by smpppd and kinternet? + * Are there interfaces controlled by smpppd and qinternet? * They are the ones with USERCONTROL=yes (#44303) * @return true/false */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.18.53/src/routines/widgets.ycp new/yast2-network-2.18.60/src/routines/widgets.ycp --- old/yast2-network-2.18.53/src/routines/widgets.ycp 2009-08-31 15:48:03.000000000 +0200 +++ new/yast2-network-2.18.60/src/routines/widgets.ycp 2009-11-10 15:50:56.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Widgets for CWM * Authors: Martin Vidner <mvidner@suse.cz> * - * $Id: widgets.ycp 58373 2009-08-17 13:16:00Z mzugec $ + * $Id: widgets.ycp 59466 2009-11-10 14:50:55Z mzugec $ */ { @@ -117,7 +117,7 @@ "label": _("Manually"), // help text for Device Activation "help": _("<p><b>Manually</b>: You control the interface manually -via 'ifup' or 'kinternet' (see 'User Controlled' below).</p> +via 'ifup' or 'qinternet' (see 'User Controlled' below).</p> "), ], "ifplugd": $[ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org