August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40033 - /tags/stable-2_15_57/network/
by mzugec＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: mzugec Date: Mon Aug 6 17:54:14 2007 New Revision: 40033 URL: http://svn.opensuse.org/viewcvs/yast?rev=40033&view=rev Log: Created tag stable-2_15_57 for network Added: tags/stable-2_15_57/network/ - copied from r40032, 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] r40032 - /tags/stable-2_15_57/
by mzugec＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: mzugec Date: Mon Aug 6 17:54:13 2007 New Revision: 40032 URL: http://svn.opensuse.org/viewcvs/yast?rev=40032&view=rev Log: Created tag stable-2_15_57 Added: tags/stable-2_15_57/ -- 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] r40031 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by mzugec＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: mzugec Date: Mon Aug 6 17:54:06 2007 New Revision: 40031 URL: http://svn.opensuse.org/viewcvs/yast?rev=40031&view=rev Log: copy udev rules from inst-sys (#297616) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40031&r1=400… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Aug 6 17:54:06 2007 @@ -1 +1 @@ -2.15.56 +2.15.57 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 Mon Aug 6 17:54:06 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 6 17:57:37 CEST 2007 - mzugec(a)suse.cz + +- copy udev rules from inst-sys (#297616) +- 2.15.57 + +------------------------------------------------------------------- Mon Aug 6 17:40:27 CEST 2007 - mzugec(a)suse.cz - removed NetworkModules (no more hwcfg files) Modified: 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 (original) +++ trunk/network/src/clients/save_network.ycp Mon Aug 6 17:54:06 2007 @@ -37,10 +37,8 @@ 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; } @@ -357,6 +355,12 @@ // -------------------------------------------------------------- // Copy udev rules for persistent names + // workaround (#292375): + // delete lock files + WFM::Execute(.local.bash, "rm -rf /dev/.udev/.lock*; rm /dev/.udev/tmp-rules*"); + // re-trigger event for net + WFM::Execute(.local.bash, "udevtrigger --subsystem-match=net"); + WFM::Execute (.local.bash, sformat ( "mkdir -p '%2%1'; /bin/cp -p %1/70-net_persistent_names.rules '%2%1'", "/etc/udev/rules.d", -- 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] r40030 - /tags/branch-SLE-10-SP1-2_13_12/cd-creator/
by lslezak＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: lslezak Date: Mon Aug 6 17:38:55 2007 New Revision: 40030 URL: http://svn.opensuse.org/viewcvs/yast?rev=40030&view=rev Log: Created tag branch-SLE-10-SP1-2_13_12 for cd-creator Added: tags/branch-SLE-10-SP1-2_13_12/cd-creator/ - copied from r40029, branches/SuSE-SLE-10-SP1-Branch/cd-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] r40029 - in /branches/SuSE-SLE-10-SP1-Branch/cd-creator: VERSION package/yast2-cd-creator.changes src/CDCreator.ycp src/data/isolinux.cfg src/dialogs.ycp
by lslezak＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: lslezak Date: Mon Aug 6 17:38:49 2007 New Revision: 40029 URL: http://svn.opensuse.org/viewcvs/yast?rev=40029&view=rev Log: - always store isolinux.cfg into the config file, even if there is no change, fixed the default boot item in isolinux.cfg for AutoYast installation (#260246) - use the correct architecture when copying packages to the target directory (#292681) - 2.13.12 Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/data/isolinux.cfg branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/VERSION Mon Aug 6 17:38:49 2007 @@ -1 +1 @@ -2.13.11 +2.13.12 Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/package/yast2-cd-creator.changes Mon Aug 6 17:38:49 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Jul 26 08:22:32 CEST 2007 - lslezak(a)suse.cz + +- always store isolinux.cfg into the config file, even if there + is no change, fixed the default boot item in isolinux.cfg for + AutoYast installation (#260246) +- use the correct architecture when copying packages to the target + directory (#292681) +- 2.13.12 + +------------------------------------------------------------------- Fri Apr 20 15:24:25 CEST 2007 - jsuchome(a)suse.cz - do not require inst-source-utils, but install it by yast2-cd-creator Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/CDCreator.ycp Mon Aug 6 17:38:49 2007 @@ -1316,11 +1316,6 @@ : sformat("%1/boot/loader/isolinux.cfg", skel_root); SCR::Write(.target.string, fname, Config["bootconfig"]:"" ); - /* - string cpCmd = sformat("cp %1/cd-creator/isolinux.cfg %2/boot/loader", - Directory::datadir, skel_root); - SCR::Execute (.target.bash, cpCmd); - */ } cpCmd = (Config["code10"]:false) ? sformat("cp %1/cd-creator/message %2/boot/%3/loader", Directory::datadir, skel_root, arch) @@ -1587,12 +1582,24 @@ Progress::Title(_("Checking for package availability...")); list<string> selectedPackages = Pkg::GetPackages (`selected , true); + y2milestone("Selected %1 packages: %2", size(selectedPackages), sort(selectedPackages)); list<string> failed = []; toCopy = $[]; foreach(string package, selectedPackages, ``{ - map package_data = Pkg::PkgProperties(package); + list<map> package_data_list = Pkg::PkgPropertiesAll(package); + map package_data = nil; + + // get the selected package + foreach(map pkg_data, package_data_list, + { + if (pkg_data["status"]:`unknown == `selected) + { + package_data = pkg_data; + } + } + ); if (package_data == nil || package_data == $[]) { Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/data/isolinux.cfg URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/data/isolinux.cfg (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/data/isolinux.cfg Mon Aug 6 17:38:49 2007 @@ -2,8 +2,7 @@ # hard disk label harddisk - kernel linux - append SLX=0x202 showopts + localboot 0x80 # autoyast label AutoYaST Modified: branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/cd-cre… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/cd-creator/src/dialogs.ycp Mon Aug 6 17:38:49 2007 @@ -609,11 +609,8 @@ } else if(ret == `next) { string isolinux_new = (string)UI::QueryWidget(`id(`isolinux), `Value); - if (isolinux_new != isolinux) - { - CDCreator::Config["bootconfig"] = isolinux_new; - } - + CDCreator::Config["bootconfig"] = isolinux_new; + y2milestone("Isolinux config: %1", isolinux_new); break; } -- 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] r40028 - /tags/stable-2_15_56/network/
by mzugec＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: mzugec Date: Mon Aug 6 17:37:26 2007 New Revision: 40028 URL: http://svn.opensuse.org/viewcvs/yast?rev=40028&view=rev Log: Created tag stable-2_15_56 for network Added: tags/stable-2_15_56/network/ - copied from r40027, 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] r40027 - /tags/stable-2_15_56/
by mzugec＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: mzugec Date: Mon Aug 6 17:37:24 2007 New Revision: 40027 URL: http://svn.opensuse.org/viewcvs/yast?rev=40027&view=rev Log: Created tag stable-2_15_56 Added: tags/stable-2_15_56/ -- 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] r40026 - in /trunk/network: ./ agents/ package/ src/lan/ src/modules/ src/routines/
by mzugec＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: mzugec Date: Mon Aug 6 17:37:14 2007 New Revision: 40026 URL: http://svn.opensuse.org/viewcvs/yast?rev=40026&view=rev Log: removed NetworkModules (no more hwcfg files) Removed: trunk/network/src/modules/NetworkModules.ycp Modified: trunk/network/VERSION trunk/network/agents/ag_udev_persistent trunk/network/package/yast2-network.changes trunk/network/src/lan/cmdline.ycp trunk/network/src/lan/complex.ycp trunk/network/src/lan/hardware.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp trunk/network/src/routines/routines.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40026&r1=400… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Aug 6 17:37:14 2007 @@ -1 +1 @@ -2.15.55 +2.15.56 Modified: trunk/network/agents/ag_udev_persistent URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/agents/ag_udev_persisten… ============================================================================== --- trunk/network/agents/ag_udev_persistent (original) +++ trunk/network/agents/ag_udev_persistent Mon Aug 6 17:37:14 2007 @@ -9,28 +9,31 @@ use strict; -my $filename = "/etc/udev/rules.d/70-net_persistent_names.rules"; +my $filename = "/etc/udev/rules.d/70-persistent-net.rules"; my @comment = (); sub parse_rules { my $class = shift; my %hash_table = (); # you don't need it read twice - return 1 if (keys(%hash_table)); +# return 1 if (keys(%hash_table)); if( open( FILE, "< $filename" ) ) { while( my $line = <FILE> ) { - # remove '\n' and speace before delimiter ',' + # remove '\n' and space before delimiter ',' chomp($line); $line =~ s/, /,/g; if ( $line =~ /^#/ ) { push(@comment, $line); } else { - my @cols = split(",", $line); - my (undef, undef, $device) = split(" ", $cols[3]); - $device =~ s/\"//g; - $hash_table{ $device } = \@cols; + if ($line =~ /,/ ) + { + my @cols = split(",", $line); + my (undef, $device) = split("=", $cols[3]); + $device =~ s/\"//g; + $hash_table{ $device } = \@cols; + } } } close(FILE); 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 Mon Aug 6 17:37:14 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 6 17:40:27 CEST 2007 - mzugec(a)suse.cz + +- removed NetworkModules (no more hwcfg files) +- 2.15.56 + +------------------------------------------------------------------- Thu Jul 26 14:16:36 CEST 2007 - mzugec(a)suse.cz - fixed edit aliases problem (#294099) Modified: trunk/network/src/lan/cmdline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/cmdline.ycp?rev=… ============================================================================== --- trunk/network/src/lan/cmdline.ycp (original) +++ trunk/network/src/lan/cmdline.ycp Mon Aug 6 17:37:14 2007 @@ -17,7 +17,6 @@ import "NetworkDevices"; import "RichText"; import "Report"; -import "NetworkModules"; import "LanItems"; import "Map"; @@ -67,6 +66,7 @@ // warn if selecting a card without a driver, #29296 // TODO also for DSL... +/* if (NetworkModules::Alias == "") { CommandLine::Print(_("The device does not have a driver module. @@ -76,6 +76,7 @@ return false; } } +*/ // this is one of 3 places to install packages :-( // - kernel modules (InstallKernel): before loaded // - smpppd & kinternet: before net start Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=… ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Mon Aug 6 17:37:14 2007 @@ -17,7 +17,6 @@ import "DNS"; import "Mode"; import "NetworkConfig"; -import "NetworkModules"; import "NetworkService"; import "Routing"; import "Wizard"; @@ -141,9 +140,7 @@ LanItems::SelectHWMap(LanItems::getCurrentItem()["hwinfo"]:$[]); LanItems::SetDefaultsForHW (); - - // warn if selecting a card without a driver, #29296 - // TODO also for DSL... +/* if (NetworkModules::Alias == "") { if (!Popup::ContinueCancel (_("The device does not have a driver module. @@ -156,11 +153,6 @@ string fw = request_firmware[NetworkModules::Alias]:""; if (fw != ""){ if ((!Package::Installed(fw) && !Package::Available(fw))){ - - //check if package with the firmware is available - //i.e. if there are any inst. sources defined - //and if the package is available on any of them - Popup::Message(sformat(_("The device needs a firmware to function properly. It can be installed from %1 Add-On CD.\nTo install the firmware, add Add-On CD to your YaST installation sources and return to this configuration dialog."), Product::name)); @@ -174,6 +166,7 @@ once you have installed the firmware."))); } } +*/ // this is one of 3 places to install packages :-( // - kernel modules (InstallKernel): before loaded // - smpppd & kinternet: before net start Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev… ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Mon Aug 6 17:37:14 2007 @@ -15,7 +15,6 @@ import "Label"; import "Lan"; import "NetworkDevices"; -import "NetworkModules"; import "Popup"; import "Wizard"; import "LanItems"; @@ -27,8 +26,7 @@ * @return dialog result */ /* Manual dialog help 1/4 */ - string hw_help = _("Here, set up your networking device. -The values are written to /etc/sysconfig/hardware/hwcfg-*. + string hw_help = _("Here, set up your networking device. ") + /* Manual dialog help 2/4 */ @@ -69,8 +67,8 @@ void initHardware(){ hardware = $[]; - hardware["modul"] = NetworkModules::Alias; // FIXME: MOD Lan::Module["module"]:""; - hardware["options"] = NetworkModules::Options; // FIXME: MOD Lan::Module["options"]:""; +// hardware["modul"] = NetworkModules::Alias; // FIXME: MOD Lan::Module["module"]:""; +// hardware["options"] = NetworkModules::Options; // FIXME: MOD Lan::Module["options"]:""; hardware["hotplug"] = LanItems::hotplug; y2milestone("hotplug=%1", LanItems::hotplug); hardware["modules_from_hwinfo"] = LanItems::GetItemModules(hardware["modul"]:"" ); @@ -145,13 +143,11 @@ /* Frame label */ term KernelBox = `Frame(_("&Kernel Module"), `HBox(`HSpacing(0.5), `VBox( `VSpacing(0.4), - /* Text entry label */ - `TextEntry(`id(`hwcfg), _("&Hardware Configuration Name"), hardware["hwcfg"]:""), `HBox( /* Text entry label */ `ComboBox(`id(`modul), `opt(`editable), _("&Module Name"), hardware["modules_from_hwinfo"]:[]), `HSpacing(0.2), - `TextEntry(`id(`options), Label::Options (), hardware["options"]:"") + `TextEntry(`id(`options), `opt(`disabled), Label::Options (), hardware["options"]:"") ), `VSpacing(0.4), CheckBoxes, @@ -183,42 +179,26 @@ /* Edit -> don't allow some changes */ // FIXME: devname if(true /* FIXME: devname Lan::operation == `edit */) { - if(LanItems::operation == `edit /* FIXME: unique || Lan::unique != "" */) { - TypeNameWidgets = - `Left(`HSquash(`Left(`VBox( -/* - `HBox( - `HWeight(1, `Right(`Label(_("Configuration Name")))), - `HSpacing(0.5), - `HWeight(1, `Left(`Label(`opt(`outputField), NetworkDevices::device_name(hardware["realtype"]:"", hardware["device"]:"")))) - ), -*/ - `VSpacing(0.5), - `HBox( - /* Label text */ - `HWeight(1, `Right(`Label(_("Hardware Name")))), - `HSpacing(0.5), - `HWeight(1, `Left(`Label(`opt(`outputField), hardware["hwcfg"]:""))) - ) - )))); - } - term contents = - `VBox( + term UdevWidget = `Frame(_("Udev rules"), `HBox( -/* - `RadioButtonGroup( - `VBox( - `Left(`RadioButton(`id(0), "SYSFS{address}=='$MAC'", true)), - `Left(`RadioButton(`id(1), "KERNELS=='$BusID'" )) - )), -*/ `TextEntry(`id(`udev_rule), _("Matching rule"), ""), `TextEntry(`id(`device_name), _("Device Name"), "") ) - ), + ); + + if(LanItems::operation == `edit ) TypeNameWidgets = `Empty(); + else UdevWidget = `Empty(); + + term contents = + `VBox( + UdevWidget, + TypeNameWidgets, + KernelBox, + `VStretch() +/* `CheckBoxFrame(`id(`enable_hwcfg), caption, hardware["hwcfg"]:"" != "", `HBox( `HSpacing(2), @@ -231,7 +211,6 @@ `HBox( `HStretch(), `HSpacing(0.5), - /* Pushbutton label */ `PushButton(`id(`list), _("Select from &List")), `HSpacing(0.5), `HStretch() @@ -241,26 +220,27 @@ `HSpacing(2), `VStretch() )) +*/ ); UI::ReplaceWidget(`hw_content, contents); -if (!hasAnyValue(LanItems::nm_name) && hasAnyValue(LanItems::nm_name_old)) UI::ChangeWidget(`enable_hwcfg, `Value, false); UI::ChangeWidget(`id(`modul), `Enabled, hardware["no_hotplug_dummy"]:false); - UI::ChangeWidget(`id(`options), `Enabled, hardware["no_hotplug_dummy"]:false); +// UI::ChangeWidget(`id(`options), `Enabled, hardware["no_hotplug_dummy"]:false); ChangeWidgetIfExists(`id(`list), `Enabled, hardware["no_hotplug_dummy"]:false); ChangeWidgetIfExists(`id(`hwcfg), `Enabled, hardware["no_hotplug"]:false); ChangeWidgetIfExists(`id(`usb), `Enabled, (hardware["hotplug"]:"" == "usb" || hardware["hotplug"]:"" == "") && hardware["type"]:"" != "dummy"); ChangeWidgetIfExists(`id(`pcmcia), `Enabled, (hardware["hotplug"]:"" == "pcmcia" || hardware["hotplug"]:"" == "") && hardware["type"]:"" != "dummy"); UI::ChangeWidget(`id(`udev_rule), `Enabled, false); UI::ChangeWidget(`id(`device_name), `Enabled, false); + UI::ChangeWidget(`id(`options), `Enabled, false); UI::ChangeWidget(`id(`udev_rule), `Value, LanItems::GetItemUdev()[0]:""); UI::ChangeWidget(`id(`device_name), `Value, LanItems::GetItemUdev()[1]:""); if (!hw_standalone) ChangeWidgetIfExists(`id(`dev), `Enabled,false); ChangeWidgetIfExists(`id(`num), `ValidChars, NetworkDevices::ValidCharsIfcfg ()); - ChangeWidgetIfExists(`id(`hwcfg), `ValidChars, NetworkModules::ValidCharsHwcfg ()); +// ChangeWidgetIfExists(`id(`hwcfg), `ValidChars, NetworkModules::ValidCharsHwcfg ()); } @@ -350,8 +330,8 @@ map card = hwlist[selected]:$[]; LanItems::description = card["name"]:""; - NetworkModules::Alias /* FIXME: MOD Lan::Module["module"] */ = card["module"]:""; - NetworkModules::Options /* FIXME: MOD Lan::Module["options"] */ = card["options"]:""; +// NetworkModules::Alias /* FIXME: MOD Lan::Module["module"] */ = card["module"]:""; +// NetworkModules::Options /* FIXME: MOD Lan::Module["options"] */ = card["options"]:""; } return ret; @@ -449,6 +429,7 @@ } void storeHW (string key, map event) { +/* if(!(boolean)UI::QueryWidget(`enable_hwcfg, `Value)) { NetworkModules::DeleteM(LanItems::nm_name); @@ -470,7 +451,6 @@ if (LanItems::operation == `add || hardware["hwcfg"]:"" != LanItems::nm_name) { if (contains (NetworkModules::ListM(""), hardware["hwcfg"]:"")) { UI::SetFocus (`id (`hwcfg)); - /* Popup text */ Popup::Error(sformat(_("Hardware configuration %1 already exists. Choose a different one."), hardware["hwcfg"]:"")); } @@ -481,7 +461,6 @@ string nm = (string) UI::QueryWidget(`id(`num), `Value); if(LanItems::operation == `add || (hardware["device"]:"" != LanItems::device && hardware["type"]:"" != LanItems::type)) { if(contains(NetworkDevices::List(""), NetworkDevices::device_name(hardware["type"]:"", nm))) { - /* Popup text */ Popup::Error(sformat(_("Configuration name %1 (%2) already exists. Choose a different one."), nm, NetworkDevices::device_name(hardware["type"]:"", nm))); UI::SetFocus(`id(`num)); @@ -514,6 +493,7 @@ hardware["type"] = (string) UI::QueryWidget(`id(`dev), `Value); LanItems::type = hardware["type"]:""; } +*/ } Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Aug 6 17:37:14 2007 @@ -25,7 +25,6 @@ import "Mode"; import "NetworkConfig"; import "NetworkDevices"; -import "NetworkModules"; import "NetworkService"; import "NetworkStorage"; import "Package"; @@ -216,7 +215,6 @@ /* Progress step 2/9 */ ProgressNextStage(_("Reading /etc/modprobe.conf...")); // FIXME: MOD // ReadModules(NetworkDevices::CardRegex["netcard"]:""); -// NetworkModules::Read(); LanItems::ReadNetworkModules(); sleep(sl); @@ -362,7 +360,7 @@ /* Progress step 2 */ ProgressNextStage(_("Writing /etc/modprobe.conf...")); // FIXME: MOD WriteModules(); - NetworkModules::Write("netcard"); +// NetworkModules::Write("netcard"); sleep(sl); if(Abort()) return false; @@ -415,7 +413,7 @@ if(Abort()) return false; /* Progress step 9 */ ProgressNextStage(_("Activating network services...")); - NetworkModules::HwUp (); +// NetworkModules::HwUp (); NetworkService::StartStop (); sleep(sl); } @@ -470,7 +468,7 @@ if (!Mode::autoinst()) { // FIXME: MOD Modules = (map) eval(settings["modules"]:$[]); NetworkDevices::Import("netcard", (map<string, map>) settings["devices"]:$[]); - NetworkModules::Import("netcard", (map<string, map>) settings["hwcfg"]:$[]); +// NetworkModules::Import("netcard", (map<string, map>) settings["hwcfg"]:$[]); } else { LanItems::autoinstall_settings = settings; } @@ -495,7 +493,7 @@ // FIXME: MOD "modules" : Modules, "config" : NetworkConfig::Export(), "devices" : NetworkDevices::Export("netcard"), - "hwcfg" : NetworkModules::Export("netcard"), +// "hwcfg" : NetworkModules::Export("netcard"), "routing" : Routing::Export(), "managed" : NetworkService::IsManaged (), "start_immediately": start_immediately, Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Mon Aug 6 17:37:14 2007 @@ -134,6 +134,7 @@ map <string, any> ReadUdevRules(){ udev_rules = (map<string, any>)SCR::Read(.udev_persistent); +y2internal("read udev : %1", udev_rules); return udev_rules; } @@ -198,8 +199,8 @@ } global void ReadNetworkModules(){ - NetworkModules::Read(); -y2internal("NetworkModules::ListM %1", NetworkModules::ListM("")); +// NetworkModules::Read(); +//y2internal("NetworkModules::ListM %1", NetworkModules::ListM("")); } global void ReadNetworkInterfaces(){ @@ -415,8 +416,8 @@ if(hotplug == "") { // FIXME: MOD Module["module"] = hw["module"]:""; // FIXME: MOD Module["options"] = hw["options"]:""; - NetworkModules::Alias = hardware["module"]:""; - NetworkModules::Options = hardware["options"]:""; +// NetworkModules::Alias = hardware["module"]:""; +// NetworkModules::Options = hardware["options"]:""; } else y2milestone("HOTPLUG(%1) -> ignoring modprobe.conf", hotplug); @@ -431,7 +432,7 @@ string busid = hardware["busid"]:""; - nm_name = createHwcfgName(hardware, type); +// nm_name = createHwcfgName(hardware, type); interfacename = hardware["dev_name"]:""; @@ -686,9 +687,13 @@ if (size(Items[current, "udev"]:[])>3) { udevs[0]=Items[current, "udev", 2]:""; +/* if (regexpmatch (Items[current, "udev", 3]:"", ".* [^ ]*\"$")) { udevs[1]=regexpsub (Items[current, "udev", 3]:"", ".* ([^ ]*)\"$", "\\1"); } +*/ + if (regexpmatch (Items[current, "udev", 3]:"", ".*=[^ ]*\"$")) + udevs[1]=regexpsub (Items[current, "udev", 3]:"", ".*=[\"]*([^ ]*)\"$", "\\1"); } return udevs; } @@ -775,17 +780,18 @@ /* kernel options */ if(hotplug == "" && alias == "" && nm_name != "") { // FIXME: MOD SelectModule(dev); - NetworkModules::SelectM(nm_name); +// NetworkModules::SelectM(nm_name); } else { // FIXME: MOD SelectModule(""); - NetworkModules::AddM(); +// NetworkModules::AddM(); } - qeth_options = NetworkModules::QETH_OPTIONS; - chan_mode = NetworkModules::CCW_CHAN_MODE; - lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; +// qeth_options = NetworkModules::QETH_OPTIONS; +// chan_mode = NetworkModules::CCW_CHAN_MODE; +// lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; +/* if (NetworkModules::QETH_IPA_TAKEOVER == nil || NetworkModules::QETH_IPA_TAKEOVER == "" || NetworkModules::QETH_IPA_TAKEOVER == "0") @@ -799,6 +805,7 @@ qeth_layer2 = false; else qeth_layer2 = true; +*/ /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { @@ -1206,10 +1213,12 @@ NetworkDevices::Commit(); Items[current, "ifcfg"] = ""; } +/* if (hasAnyValue(hwcfg)) { NetworkModules::DeleteM(hwcfg); Items[current, "hwcfg"] = ""; } +*/ if (! (size(Items[current, "hwinfo"]:$[])>0) ){ map<integer, any> tmp_items = $[]; foreach(integer key, any value, Items, { @@ -1232,9 +1241,9 @@ type = Items[current, "hwinfo", "type"]:""; device = NetworkDevices::device_num(Items[current, "ifcfg"]:""); alias = NetworkDevices::alias_num(Items[current, "ifcfg"]:""); - nm_name = Items[current, "hwcfg"]:""; - if (nm_name=="") nm_name_old = createHwcfgName(Items[current, "hwinfo"]:$[], type); - NetworkModules::SelectM(nm_name); +// nm_name = Items[current, "hwcfg"]:""; +// if (nm_name=="") nm_name_old = createHwcfgName(Items[current, "hwinfo"]:$[], type); +// NetworkModules::SelectM(nm_name); /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); @@ -1252,13 +1261,14 @@ /* kernel options */ if(hotplug == "" && alias == "" && nm_name != "") { // FIXME: MOD SelectModule(dev); - NetworkModules::SelectM(nm_name); +// NetworkModules::SelectM(nm_name); } else { // FIXME: MOD SelectModule(""); - NetworkModules::AddM(); +// NetworkModules::AddM(); } +/* qeth_options = NetworkModules::QETH_OPTIONS; chan_mode = NetworkModules::CCW_CHAN_MODE; lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; @@ -1276,7 +1286,7 @@ qeth_layer2 = false; else qeth_layer2 = true; - +*/ /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.yc… ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Mon Aug 6 17:37:14 2007 @@ -19,7 +19,6 @@ import "PackageSystem"; import "NetworkDevices"; import "Arch"; -import "NetworkModules"; import "Confirm"; import "Map"; @@ -411,29 +410,6 @@ } -string createHwcfgName(map hw, string type){ - string hwcfg_name = ""; - // name of hwcfg - if(hasAnyValue(hw["busid"]:"")) { - // #208854 - include "static" string - if(issubstring(hw["sysfs_id"]:"", "pnp")){ - hwcfg_name = "static-bus-" + hw["bus"]:"" + "-" + hw["busid"]:""; - } - else{ - hwcfg_name = "bus-" + hw["bus"]:"" + "-" + hw["busid"]:""; - if(Arch::s390 ()) hwcfg_name = DriverType(type) + "-" + hwcfg_name; - } - } - else { - // #suse42421 - don't write hwcfg-static for pcmcia cards (PC and CardBus) - // #254753 - when busID not available, use static-x hwcfg filename - if(Arch::s390 ()) { - hwcfg_name = NetworkModules::GetFreeName("static-"); - y2internal("No bus id info found, will use %1", hwcfg_name); - } else y2warning ("No bus id info found, skipping hwcfg: %1", hw); - } - return hwcfg_name; -} define string DistinguishedName(string name, map hwdevice) { if(hwdevice["sysfs_bus_id"]:"" != "") -- 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] r40025 - /tags/stable-2_15_40/installation/
by locilka＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: locilka Date: Mon Aug 6 17:32:00 2007 New Revision: 40025 URL: http://svn.opensuse.org/viewcvs/yast?rev=40025&view=rev Log: Created tag stable-2_15_40 for installation Added: tags/stable-2_15_40/installation/ - copied from r40024, trunk/installation/ -- 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] r40024 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_worker_initial.ycp
by locilka＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: locilka Date: Mon Aug 6 17:31:06 2007 New Revision: 40024 URL: http://svn.opensuse.org/viewcvs/yast?rev=40024&view=rev Log: 2.15.40 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_worker_initial.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=40024&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Aug 6 17:31:06 2007 @@ -1 +1 @@ -2.15.39 +2.15.40 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Aug 6 17:31:06 2007 @@ -6,6 +6,8 @@ - Added help for that check-box (#296810). - First stage network setup dialog - changes in dialog alignment (#295043). +- Initialize mouse after installation steps are displayed (#296406) +- 2.15.40 ------------------------------------------------------------------- Thu Aug 2 08:53:56 CEST 2007 - jsrain(a)suse.cz Modified: trunk/installation/src/clients/inst_worker_initial.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_wo… ============================================================================== --- trunk/installation/src/clients/inst_worker_initial.ycp (original) +++ trunk/installation/src/clients/inst_worker_initial.ycp Mon Aug 6 17:31:06 2007 @@ -54,11 +54,13 @@ // Cleanup and other settings InitFirstStageInstallationSystem(); + // Redraw steps before mouse is initialized + // Bugzilla #296406 + UpdateWizardSteps (); + // Initial stage InitMouse(); - UpdateWizardSteps (); - // All stages // Shows fallback message if running in textmode (if used as fallback) ShowTextFallbackMessage(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0