October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r51844 - /tags/stable-2_17_36/network/
by mzugec＠svn.opensuse.org 04 Oct '08

04 Oct '08

Author: mzugec Date: Sat Oct 4 11:36:52 2008 New Revision: 51844 URL: http://svn.opensuse.org/viewcvs/yast?rev=51844&view=rev Log: Created tag stable-2_17_36 for network Added: tags/stable-2_17_36/network/ - copied from r51843, 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] r51843 - in /trunk/network: VERSION package/yast2-network.changes src/lan/hardware.ycp src/lan/wizards.ycp src/modules/LanItems.ycp
by mzugec＠svn.opensuse.org 04 Oct '08

04 Oct '08

Author: mzugec Date: Sat Oct 4 11:36:36 2008 New Revision: 51843 URL: http://svn.opensuse.org/viewcvs/yast?rev=51843&view=rev Log: - adapt yast to configure network devices on s390 using udev (fate#304938) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/hardware.ycp trunk/network/src/lan/wizards.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=51843&r1=518… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Sat Oct 4 11:36:36 2008 @@ -1 +1 @@ -2.17.35 +2.17.36 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 Sat Oct 4 11:36:36 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Oct 4 11:25:21 CEST 2008 - mzugec(a)suse.de + +- adapt yast to configure network devices on s390 using udev + (fate#304938) +- 2.17.36 + +------------------------------------------------------------------- Thu Oct 2 21:21:38 CEST 2008 - mzugec(a)suse.de - check NM plugin after network is up (bnc#427374) 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 Sat Oct 4 11:36:36 2008 @@ -164,7 +164,7 @@ /* Text entry label */ `ComboBox(`id(`modul), `opt(`editable), _("&Module Name"), hardware["modules_from_hwinfo"]:[]), `HSpacing(0.2), - `TextEntry(`id(`options), Label::Options (), hardware["options"]:"") + `InputField(`id(`options), `opt(`hstretch), Label::Options (), hardware["options"]:"") ), `VSpacing(0.4), CheckBoxes, @@ -202,7 +202,7 @@ // TODO: Ud ... Rules `Frame(_("Udev rules"), `HBox( - `TextEntry(`id(`device_name), _("Device Name"), ""), + `InputField(`id(`device_name), `opt(`hstretch), _("Device Name"), ""), `PushButton(`id(`change_udev), _("Change")) ) ); @@ -269,7 +269,7 @@ `ReplacePoint(`id(`rp), `SelectionBox(`id(`cards), _("&Network Card"), cards)), `VSpacing(0.5), /* Text entry field */ - `TextEntry(`id(`search), `opt(`notify), _("&Search")), + `InputField(`id(`search), `opt(`hstretch, `notify), _("&Search")), `VSpacing(0.5) ); @@ -525,6 +525,8 @@ */ define any S390Dialog() { + // already configured device (on hardware layer), skip this dialog + if (size(LanItems::Items[LanItems::current, "hwinfo", "dev_name"]:"")>0) return `next; ScreenName("lan-hardware-s390"); /* S/390 dialog caption */ @@ -535,17 +537,25 @@ string helptext = ""; term contents = `Empty (); + if(LanItems::type == "qeth") { + // CHANIDS + list<string> tmp_list=splitstring(LanItems::qeth_chanids, " "); + map<string, any> chanids_map = $[ + "read" : tmp_list[0]:"", + "write" : tmp_list[1]:"", + "control" : tmp_list[2]:"" + ]; contents = `HBox( `HSpacing(6), /* Frame label */ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), /* TextEntry label */ - `TextEntry(`id(`chan_mode), _("&Port Name"), LanItems::chan_mode), + `InputField(`id(`chan_mode), `opt(`hstretch), _("&Port Name"), LanItems::chan_mode), `VSpacing(1), /* TextEntry label */ - `TextEntry(`id(`qeth_options), Label::Options (), LanItems::qeth_options), + `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options), `VSpacing(1), /* CheckBox label */ `Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))), @@ -553,8 +563,14 @@ /* CheckBox label */ `Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))), /* TextEntry label */ - `TextEntry(`id(`qeth_macaddress), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), - `VSpacing(1) + `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), + `VSpacing(1), +// `InputField(`id(`qeth_chanids), `opt(`hstretch), _("CHAN IDS"), LanItems::qeth_chanids) + `HBox( + `InputField(`id(`qeth_chan_read), `opt(`hstretch), _("Read Channel"), chanids_map["read"]:""), + `InputField(`id(`qeth_chan_write), `opt(`hstretch), _("Write Channel"), chanids_map["write"]:""), + `InputField(`id(`qeth_chan_control), `opt(`hstretch), _("Control Channel"), chanids_map["control"]:"") + ) ), `HSpacing(2))), `HSpacing(6) ); @@ -574,7 +590,7 @@ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), /* TextEntry label */ - `TextEntry(`id(`qeth_options), Label::Options (), LanItems::qeth_options), + `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options), `VSpacing(1), /* CheckBox label */ `Left(`CheckBox(`id(`ipa_takeover), _("&Enable IPA Takeover"))), @@ -582,7 +598,7 @@ /* CheckBox label */ `Left(`CheckBox(`id(`qeth_layer2), `opt(`notify), _("Enable &Layer 2 Support"))), /* TextEntry label */ - `TextEntry(`id(`qeth_macaddress), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), + `InputField(`id(`qeth_macaddress), `opt(`hstretch), _("Layer2 &MAC Address"), LanItems::qeth_macaddress), `VSpacing(1) ), `HSpacing(2))), `HSpacing(6) @@ -601,10 +617,10 @@ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), /* TextEntry label */ - `TextEntry(`id(`chan_mode), _("&Port Number"), LanItems::chan_mode), + `InputField(`id(`chan_mode), `opt(`hstretch), _("&Port Number"), LanItems::chan_mode), `VSpacing(1), /* TextEntry label */ - `TextEntry(`id(`lcs_timeout), _("&LANCMD Time-Out"), LanItems::lcs_timeout) + `InputField(`id(`lcs_timeout), `opt(`hstretch), _("&LANCMD Time-Out"), LanItems::lcs_timeout) ), `HSpacing(2))), `HSpacing(6) ); @@ -625,6 +641,11 @@ ]; if(drvtype == "ctc") { + list<string> tmp_list=splitstring(LanItems::qeth_chanids, " "); + map<string, any> chanids_map = $[ + "read" : tmp_list[0]:"", + "write" : tmp_list[1]:"", + ]; contents = `HBox( `HSpacing(6), /* Frame label */ @@ -632,7 +653,11 @@ `VSpacing(1), /* TextEntry label */ `ComboBox(`id(`chan_mode), _("&Protocol"), ctcitems), - `VSpacing(1) + `VSpacing(1), + `HBox( + `InputField(`id(`qeth_chan_read), `opt(`hstretch), _("Read Channel"), chanids_map["read"]:""), + `InputField(`id(`qeth_chan_write), `opt(`hstretch), _("Write Channel"), chanids_map["write"]:"") + ) ), `HSpacing(2))), `HSpacing(6) ); @@ -647,7 +672,7 @@ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), /* TextEntry label, #42789 */ - `TextEntry(`id(`chan_mode), _("&Peer Name"), ""), + `InputField(`id(`chan_mode), `opt(`hstretch), _("&Peer Name"), ""), `VSpacing(1) ), `HSpacing(2))), `HSpacing(6) @@ -702,25 +727,14 @@ break; } else if(ret == `next) { - break; - } - else if(ret == `qeth_layer2) { - continue; - } - else { - y2error("Unexpected return code: %1", ret); - continue; - } - } - - if(ret == `next) { if(LanItems::type == "iucv") { // #176330, must be static LanItems::nm_name = "static-iucv-id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); LanItems::device = "id-" + (string) UI::QueryWidget(`id(`chan_mode), `Value); } - else if (LanItems::type != "hsi") - LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); + if (LanItems::type != "hsi") + LanItems::chan_mode = (string) UI::QueryWidget(`id(`chan_mode), `Value); + if(LanItems::type == "lcs") LanItems::lcs_timeout = (string) UI::QueryWidget(`id(`lcs_timeout), `Value); if(LanItems::type == "qeth" || LanItems::type == "hsi") { @@ -729,7 +743,25 @@ LanItems::qeth_layer2 = (boolean) UI::QueryWidget(`id(`qeth_layer2), `Value); LanItems::qeth_macaddress = (string) UI::QueryWidget(`id(`qeth_macaddress), `Value); } - + string read = (string) UI::QueryWidget(`id(`qeth_chan_read), `Value); + string write = (string) UI::QueryWidget(`id(`qeth_chan_write), `Value); + string control = (string) UI::QueryWidget(`id(`qeth_chan_control), `Value); + if (control==nil) control=""; + LanItems::qeth_chanids = String::CutBlanks( sformat("%1 %2 %3", read, write, control) ); + if (!LanItems::createS390Device()){ + Popup::Error(_("An error occured while creating device.\nSee YaST log for details.")); + ret=nil; + continue; + }; + break; + } + else if(ret == `qeth_layer2) { + continue; + } + else { + y2error("Unexpected return code: %1", ret); + continue; + } } return ret; Modified: trunk/network/src/lan/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/wizards.ycp?rev=… ============================================================================== --- trunk/network/src/lan/wizards.ycp (original) +++ trunk/network/src/lan/wizards.ycp Sat Oct 4 11:36:36 2008 @@ -155,7 +155,8 @@ if(action == "add") ws_start = "hardware"; /* All S/390 network devices */ - if(Arch::s390 () && LanItems::operation == `add) { +// if(Arch::s390 () && LanItems::operation == `add) { + if(Arch::s390 () ) { ws_start = "s390"; } 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 Sat Oct 4 11:36:36 2008 @@ -127,6 +127,7 @@ // MAC address handling for IPv4 with the layer2 option global boolean qeth_layer2 = false; global string qeth_macaddress = "00:00:00:00:00:00"; +global string qeth_chanids = ""; // Timeout for LCS LANCMD global string lcs_timeout = "5"; @@ -552,7 +553,7 @@ rich = " " + conn + " " + mac_dev; rich = HTML::Bold ( descr ) + rich; - if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0) + if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0 && !Arch::s390()) rich = rich + _("Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details."); else if (hasAnyValue(Items[key, "ifcfg"]:"") ) rich = rich + HTML::List (bullets); else { @@ -1577,8 +1578,62 @@ global boolean enableCurrentEditButton(){ if (needFirmwareCurrentItem()) return true; + if (Arch::s390()) return true; if (!hasAnyValue(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) return false; else return true; } +global boolean createS390Device(){ + y2milestone("creating device s390 network device"); + boolean result=true; + // command to create device + string command1=""; + // command to find created device + string command2=""; + switch(type){ + case "qeth": + // chan_ids (read, write, control), port + command1=sformat("qeth_configure -p %1 %2 1", chan_mode, qeth_chanids); + command2=sformat("ls /sys/devices/%1/%2/net/|head -n1|tr -d '\n'", type, (splitstring(qeth_chanids, " "))[0]:""); + break; + case "ctc": + // chan_ids (read, write), protocol + command1=sformat("ctc_configure %1 1 %2", qeth_chanids, chan_mode); + command2=sformat("ls /sys/devices/cu3088/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); + break; + case "iucv": + // router + command1=sformat("iucv_configure %1", chan_mode); + command2=sformat("ls /sys/devices/%1/*/net/|head -n1|tr -d '\n'", type); + break; + default: + y2error("Unsupported type : %1", type); + } + y2milestone("execute %1", command1); + map<string, any> output1=(map<string, any>) SCR::Execute(.target.bash_output, command1); + if (output1["exit"]:-1==0 && size(output1["stderr"]:"")==0) y2milestone("Success : %1", output1); + else{ + y2error("Problem occured : %1", output1); + result=false; + } + y2milestone("output1 %1", output1); + + + if (result){ + y2milestone("command2 %1", command2); + map<string, any> output2=(map<string, any>) SCR::Execute(.target.bash_output, command2); + y2milestone("output2 %1", output2); + if (output2["exit"]:-1==0 && size(output2["stderr"]:"")==0){ + Items[current, "ifcfg"] = output2["stdout"]:""; + Items[current, "hwinfo", "dev_name"] = output2["stdout"]:""; + y2milestone("Device %1 created", output2["stdout"]:""); + }else{ + y2error("Some problem occured : %1", output2); + result=false; + } + } + + return result; +} + } -- 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] r51842 - /trunk/bootloader/src/modules/BootCommon.ycp
by juhliarik＠svn.opensuse.org 03 Oct '08

03 Oct '08

Author: juhliarik Date: Fri Oct 3 17:27:33 2008 New Revision: 51842 URL: http://svn.opensuse.org/viewcvs/yast?rev=51842&view=rev Log: corrected typo Modified: trunk/bootloader/src/modules/BootCommon.ycp Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Fri Oct 3 17:27:33 2008 @@ -1099,7 +1099,7 @@ { PackagesProposal::RemoveResolvables("yast2-bootloader", `package, ["grub"]); - y2milestone("deselect %1 for installation", btl); + y2milestone("deselect grub for installation"); ret = true; } -- 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] r51841 - in /trunk/bootloader: VERSION scripts/update_gfxmenu src/clients/inst_lilo_convert.ycp src/modules/BootCommon.ycp src/modules/BootPOWERLILO.ycp src/routines/misc.ycp
by juhliarik＠svn.opensuse.org 03 Oct '08

03 Oct '08

Author: juhliarik Date: Fri Oct 3 17:26:39 2008 New Revision: 51841 URL: http://svn.opensuse.org/viewcvs/yast?rev=51841&view=rev Log: added fixes: * installation of bootloader package * 2 identical section in powerLILO * powerLILO doesn't support disk "by-label" Modified: trunk/bootloader/VERSION trunk/bootloader/scripts/update_gfxmenu trunk/bootloader/src/clients/inst_lilo_convert.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootPOWERLILO.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=51841&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Fri Oct 3 17:26:39 2008 @@ -1 +1 @@ -2.17.24 +2.17.25 Modified: trunk/bootloader/scripts/update_gfxmenu URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/scripts/update_gfxmen… ============================================================================== --- trunk/bootloader/scripts/update_gfxmenu (original) +++ trunk/bootloader/scripts/update_gfxmenu Fri Oct 3 17:26:39 2008 @@ -30,18 +30,27 @@ || test -f $SRC_DIR/$LOCALE_SHORT.tr && cp $SRC_DIR/$LOCALE_SHORT.tr . test -f $SRC_DIR/$LOCALE.hlp && cp I4/$LOCALE.hlp . \ || test -f $SRC_DIR/$LOCALE_SHORT.hlp && cp $SRC_DIR/$LOCALE_SHORT.hlp . + # set languages to choose -if [ "$LOCALE_SHORT" = "en" ] ; then - echo -n "en -" >languages || exit 6 +if [ -f $SRC_DIR/$LOCALE.tr ]; then + echo -n $LOCALE > languages || exit 6 + + # set translations of bootloaer menu entries + cp $MENU_ENTRIES ./translations.$LOCALE || exit 7; else - echo -n "$LOCALE_SHORT -en -" >languages || exit 6 + if [ "$LOCALE_SHORT" = "en" ]; then + echo -n "en + " >languages || exit 6 + else + echo -n "$LOCALE_SHORT + en + " >languages || exit 6 + fi + + # set translations of bootloaer menu entries + cp $MENU_ENTRIES ./translations.$LOCALE_SHORT || exit 7; fi -# set translations of bootloaer menu entries -cp $MENU_ENTRIES ./translations.$LOCALE_SHORT || exit 7; test -f $SRC_DIR/background.jpg && cp $SRC_DIR/background.jpg back.jpg Modified: trunk/bootloader/src/clients/inst_lilo_convert.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/inst_lilo… ============================================================================== --- trunk/bootloader/src/clients/inst_lilo_convert.ycp (original) +++ trunk/bootloader/src/clients/inst_lilo_convert.ycp Fri Oct 3 17:26:39 2008 @@ -121,7 +121,7 @@ boolean checkArch() { boolean ret = false; - if (Arch::x86_64() || Arch::i386() || Arch::ia64()) + if (Arch::x86_64() || Arch::i386()) ret = true; if (ret) Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Fri Oct 3 17:26:39 2008 @@ -33,6 +33,7 @@ import "String"; import "Pkg"; import "Popup"; +import "PackagesProposal"; import "Linuxrc"; @@ -1085,6 +1086,8 @@ return loader_type; } + + /** * The function handle selecting and deselecting packages (bootloaders) * @return boolean true on success @@ -1094,18 +1097,12 @@ boolean ret = false; if (globals["trusted_grub"]:"" == "true") { - list <string> packages = ["grub"]; - foreach (string btl, packages, { - if (Pkg::IsSelected(btl)) - { - Pkg::PkgNeutral (btl); - y2milestone("deselect %1 for installation", btl); - ret = true; - } - }); + + PackagesProposal::RemoveResolvables("yast2-bootloader", `package, ["grub"]); + y2milestone("deselect %1 for installation", btl); + ret = true; + } - if (ret) - Pkg::PkgSolve (false); return ret; } @@ -1134,10 +1131,12 @@ && (Linuxrc::InstallInf ("kexec_reboot") != "0")) { bootloader_packages = bootloader_attribs[bootloader, "kexec-tools", "required_packages"]:[]; + bootloader_packages = add(bootloader_packages, "kexec-tools"); } else { bootloader_packages = bootloader_attribs[bootloader, "required_packages"]:[]; } + if (globals["trusted_grub"]:"" == "true") { bootloader_packages = bootloader_attribs[bootloader, "trustedgrub", "required_packages"]:[]; @@ -1146,6 +1145,8 @@ bootloader_packages = add(bootloader_packages, "trustedgrub"); } + //FIXME: solve problem with installing bootloader... + bootloader_packages = add(bootloader_packages, bootloader); // don't configure package manager during autoinstallation preparing if (Mode::normal () && (! (Mode::config () || Mode::repair ()))) @@ -1157,19 +1158,14 @@ { boolean pkg_added = false; foreach (string p, bootloader_packages, { - if (! Pkg::IsSelected (p)) - { - Pkg::PkgInstall (bootloader); - pkg_added = true; - } + y2milestone("Select bootloader package: %1", p); + PackagesProposal::AddResolvables ("yast2-bootloader", `package, [p]); + pkg_added = true; + }); if (pkg_added) { boolean ret = solvePackage(); - // if package was added in inst. proposal, I can't be sure - // that dependencies will be solved - if (ret) - Pkg::PkgSolve (false); } } } Modified: trunk/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootPOWER… ============================================================================== --- trunk/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ trunk/bootloader/src/modules/BootPOWERLILO.ycp Fri Oct 3 17:26:39 2008 @@ -34,6 +34,7 @@ import "Pkg"; import "Stage"; import "Storage"; +import "GfxMenu"; /* * include ppc specific help messages @@ -458,10 +459,11 @@ map<string,any> ret = $[ "type" : "image", - "name" : title, + "name" : GfxMenu::translateSectionTitle(title, "ppc"), "original_name" : title, "image" : image_fn, "initrd" : initrd_fn, + "optional" : "true", // bnc #217443 "root" : BootCommon::RootPartitionDevice, // "": do not include resume parameter on ppc "append" : BootArch::DefaultKernelParams (""), Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Fri Oct 3 17:26:39 2008 @@ -322,9 +322,13 @@ global map<string,string> remapDeviceMap(map<string,string> device_map) { - symbol by_mount = Storage::GetDefaultMountBy(); - - //symbol by_mount = `id; + symbol by_mount = nil; + if (Arch::ppc()) + by_mount = `id; + else + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; if (by_mount == `label) return device_map; @@ -347,8 +351,13 @@ global map<string,string> remapGlobals(map<string,string> globals_set) { - symbol by_mount = Storage::GetDefaultMountBy(); - //symbol by_mount = `id; + symbol by_mount = nil; + if (Arch::ppc()) + by_mount = `id; + else + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; if (by_mount == `label) return globals_set; @@ -500,8 +509,13 @@ global list<map<string,any> > remapSections(list<map<string,any> >sec) { - symbol by_mount = Storage::GetDefaultMountBy(); - //symbol by_mount = `id; + symbol by_mount = nil; + if (Arch::ppc()) + by_mount = `id; + else + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; if (by_mount == `label) return sec; @@ -556,8 +570,13 @@ y2milestone ("Dev2MountByDev: %1", dev); // (`id,`uuid,`path,`device,`label) - symbol by_mount = Storage::GetDefaultMountBy(); - //symbol by_mount = `id; + symbol by_mount = nil; + if (Arch::ppc()) + by_mount = `id; + else + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; y2milestone("Default mount by is %1", by_mount); map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); @@ -2112,7 +2131,7 @@ if (inst_bootloader) { WFM::Execute(.local.mkdir, Installation::destdir + "/etc/sysconfig"); - WFM::Write(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); + WFM::Execute(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini( `SysConfigFile(target_sysconfig_path))); -- 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] r51840 - /tags/stable-2_17_25/packager/
by lslezak＠svn.opensuse.org 03 Oct '08

03 Oct '08

Author: lslezak Date: Fri Oct 3 16:48:30 2008 New Revision: 51840 URL: http://svn.opensuse.org/viewcvs/yast?rev=51840&view=rev Log: Created tag stable-2_17_25 for packager Added: tags/stable-2_17_25/packager/ - copied from r51839, trunk/packager/ -- 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] r51839 - in /trunk/packager: VERSION package/yast2-packager.changes
by lslezak＠svn.opensuse.org 03 Oct '08

03 Oct '08

Author: lslezak Date: Fri Oct 3 16:48:25 2008 New Revision: 51839 URL: http://svn.opensuse.org/viewcvs/yast?rev=51839&view=rev Log: - 2.17.25 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=51839&r1=51… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Oct 3 16:48:25 2008 @@ -1 +1 @@ -2.17.24 +2.17.25 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Oct 3 16:48:25 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 3 16:45:29 CEST 2008 - lslezak(a)suse.cz + +- Fixed handling of services (bnc#427728) +- 2.17.25 + +------------------------------------------------------------------- Thu Oct 2 22:17:07 CEST 2008 - locilka(a)suse.cz - Packager requires new YCP module PackagesProposal from 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] r51838 - /tags/stable-2_17_17/pkg-bindings/
by lslezak＠svn.opensuse.org 03 Oct '08

03 Oct '08

Author: lslezak Date: Fri Oct 3 16:41:44 2008 New Revision: 51838 URL: http://svn.opensuse.org/viewcvs/yast?rev=51838&view=rev Log: Created tag stable-2_17_17 for pkg-bindings Added: tags/stable-2_17_17/pkg-bindings/ - copied from r51837, trunk/pkg-bindings/ -- 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] r51837 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes
by lslezak＠svn.opensuse.org 03 Oct '08

03 Oct '08

Author: lslezak Date: Fri Oct 3 16:41:37 2008 New Revision: 51837 URL: http://svn.opensuse.org/viewcvs/yast?rev=51837&view=rev Log: - 2.17.17 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=51837&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Fri Oct 3 16:41:37 2008 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Oct 3 16:41:37 2008 @@ -4,6 +4,7 @@ - fixed Pkg::PkgReset() - reset the status (instead of unselect) (bnc#431565) - service handling related fixes (bnc#427728) +- 2.17.17 ------------------------------------------------------------------- Thu Oct 2 12:50:39 CEST 2008 - lslezak(a)suse.cz -- 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] r51836 - in /trunk/packager/src: clients/repositories.ycp modules/SourceDialogs.ycp
by lslezak＠svn.opensuse.org 03 Oct '08

03 Oct '08

Author: lslezak Date: Fri Oct 3 16:40:11 2008 New Revision: 51836 URL: http://svn.opensuse.org/viewcvs/yast?rev=51836&view=rev Log: - display "Service Name" label instead of "Repository Name" when editing a service Modified: trunk/packager/src/clients/repositories.ycp trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Fri Oct 3 16:40:11 2008 @@ -971,7 +971,7 @@ SourceDialogs::SetRepoName(service_info["name"]:""); do { - url = SourceDialogs::EditPopupType(url, false); + url = SourceDialogs::EditPopupService(url); if ( size( url ) == 0 ) break; if (url != old_url) Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Fri Oct 3 16:40:11 2008 @@ -319,6 +319,23 @@ } +map<string,any> ServiceNameWidget() +{ + map<string,any> ret = RepoNameWidget(); + + ret["custom_widget"] = `VBox ( + // text entry + `InputField( `id( `repo_name ), `opt(`hstretch), _("&Service Name") ) + ); + + // help text + ret["help"] = _("<big>Service Name</big> +Use Service Name to specify the name of the service. If it is empty, YaST will use part of the service URL as the name. +"); + + return ret; +} + // raw URL editation widget /** @@ -1938,6 +1955,7 @@ if (size (_widgets) == 0) _widgets = $[ "repo_name" : RepoNameWidget(), + "service_name" : ServiceNameWidget(), "url" : PlainURLWidget (), "nfs" : NFSWidget (), "cd" : CDWidget (), @@ -1996,12 +2014,12 @@ * @param proto string protocol to display popup for * @return term popup contents */ -term PopupContents (string proto) { +term PopupContents (string proto, boolean repository) { return `VBox ( `HSpacing (50), // label `Heading(_caption[proto]:""), - "repo_name", + repository ? "repo_name" : "service_name", `VSpacing(0.5), proto, `VSpacing(0.5), @@ -2009,14 +2027,15 @@ ); }; -string EditDisplay() +string EditDisplayInt(boolean repository) { string proto = URLScheme (_url); - y2milestone ("Displaying popup for protocol %1", proto); + y2milestone ("Displaying %1 popup for protocol %2", repository ? "repository" : "service", proto); - list<map<string,any> > w = CWM::CreateWidgets (["repo_name", proto], Widgets ()); - term contents = PopupContents (proto); + list<map<string,any> > w = CWM::CreateWidgets ([ (repository ? "repo_name" : "service_name"), proto], Widgets ()); + y2internal("w: %1", w); + term contents = PopupContents (proto, repository); contents = CWM::PrepareDialog (contents, w); UI::OpenDialog (contents); symbol ret = CWM::Run (w, $[]); @@ -2028,6 +2047,16 @@ return ""; } +string EditDisplay() +{ + return EditDisplayInt(true); +} + +string EditDisplayService() +{ + return EditDisplayInt(false); +} + /** * URL editation popup * @param url string url URL to edit @@ -2040,6 +2069,17 @@ } /** + * URL editation popup + * @param url string url URL to edit + * @return string modified URL or empty string if canceled + */ +global string EditPopupService (string url) { + SetURL (url); + + return EditDisplayService(); +} + +/** * URL editation popup, allows setting plaindir type * @param url string url URL to edit * @param plaindir_type set to true if the repository is plaindor @@ -2082,6 +2122,26 @@ "fallback_functions" : $[] ]); } + +/** + * Sample implementation of URL selection dialog + * @return symbol for wizard sequencer + */ +global symbol EditDialogProtocolService(string proto) +{ + y2milestone ("Displaying service dialog for protocol %1", proto); + string caption = _caption[proto]:""; + + return CWM::ShowAndRun ($[ + "widget_names" : ["service_name", proto], + "widget_descr" : Widgets (), + "contents" : `HVCenter(`MinWidth( 65, `VBox ("service_name", proto ) ) ), + "caption" : caption, + "back_button" : Label::BackButton (), + "next_button" : Label::NextButton (), + "fallback_functions" : $[] + ]); +} /** * Sample implementation of URL selection dialog * @return symbol for wizard sequencer @@ -2098,7 +2158,7 @@ */ global string TypePopup () { list<map<string,any> > w = CWM::CreateWidgets (["select"], Widgets ()); - term contents = PopupContents ("select"); + term contents = PopupContents ("select", true); contents = CWM::PrepareDialog (contents, w); UI::OpenDialog (contents); symbol ret = CWM::Run (w, $[]); -- 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] r51835 - in /trunk/installation: control/control.SLED.xml control/control.openSUSE.xml package/yast2-installation.changes src/include/misc.ycp
by locilka＠svn.opensuse.org 03 Oct '08

03 Oct '08

Author: locilka Date: Fri Oct 3 16:33:31 2008 New Revision: 51835 URL: http://svn.opensuse.org/viewcvs/yast?rev=51835&view=rev Log: - Enabling some steps in second stage even if Automatic Configuration is in use. - Feature added into openSUSE and SLED control files (both bnc #428190). Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.openSUSE.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/include/misc.ycp Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Fri Oct 3 16:33:31 2008 @@ -83,6 +83,12 @@ <enable_autoconfiguration config:type="boolean">true</enable_autoconfiguration> <autoconfiguration_default config:type="boolean">true</autoconfiguration_default> +  + <autoconfiguration_enabled_modules config:type="list"> + <module>cont_suse_register</module> + <module>cont_suseconfig</module> + </autoconfiguration_enabled_modules> +  <automatic_configuration config:type="list">  + <autoconfiguration_enabled_modules config:type="list"> + <module>cont_suse_register</module> + <module>cont_suseconfig</module> + </autoconfiguration_enabled_modules> +  <kexec_reboot config:type="boolean">true</kexec_reboot> @@ -1168,7 +1174,8 @@ <execute>inst_user</execute> </module> <module> - <name>suseconfig</name> + <name>cont_suseconfig</name> + <execute>inst_suseconfig</execute> <enable_back>no</enable_back> <enable_next>no</enable_next> </module> 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 Fri Oct 3 16:33:31 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Oct 3 16:31:10 CEST 2008 - locilka(a)suse.cz + +- Enabling some steps in second stage even if Automatic + Configuration is in use. +- Feature added into openSUSE and SLED control files + (both bnc #428190). + +------------------------------------------------------------------- Thu Oct 2 22:00:46 CEST 2008 - mzugec(a)suse.de - changed Release Notes into Support group (bnc#430005) Modified: trunk/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.yc… ============================================================================== --- trunk/installation/src/include/misc.ycp (original) +++ trunk/installation/src/include/misc.ycp Fri Oct 3 16:33:31 2008 @@ -24,6 +24,7 @@ import "Installation"; import "Mode"; import "ProductControl"; +import "ProductFeatures"; import "Label"; import "FileUtils"; import "Linuxrc"; @@ -205,15 +206,42 @@ return ( button == `confirm ); } + list <string> modules_to_enable_with_AC_on = nil; + + // Some client calls have to be called even if using AC + void EnableRequiredModules () { + // Lazy init + if (modules_to_enable_with_AC_on == nil) { + any feature = ProductFeatures::GetFeature ("globals", "autoconfiguration_enabled_modules"); + + if (feature == "" || feature == nil || feature == []) { + modules_to_enable_with_AC_on = []; + } else { + modules_to_enable_with_AC_on = (list <string>) feature; + } + + y2milestone ("Steps to enable with AC in use: %1", modules_to_enable_with_AC_on); + } + + if (modules_to_enable_with_AC_on != nil) { + foreach (string one_module, modules_to_enable_with_AC_on, { + ProductControl::EnableModule (one_module); + }); + } + } + void AdjustAutomaticConfiguration () { if (ProductControl::GetUseAutomaticConfiguration()) { y2milestone ("Using AC..."); - ProductControl::DisableAllModulesAndProposals ("installation", "continue"); - ProductControl::EnableModule ("automatic_configuration"); - // Enable SuSEConfig, bnc #381751 - ProductControl::EnableModule ("suseconfig"); + + ProductControl::DisableAllModulesAndProposals ("installation", "continue"); + ProductControl::EnableModule ("automatic_configuration"); + + // Enable Modules that are required to run even if using AC, bnc #428190 + EnableRequiredModules(); } else { y2milestone ("Not using AC..."); + ProductControl::UnDisableAllModulesAndProposals ("installation", "continue"); ProductControl::DisableModule ("automatic_configuration"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0