YaST Commits March 2012

yast-commit@lists.opensuse.org

13 participants
282 discussions

[yast-commit] r67839 - /branches/unsupported/x11/ /trunk/x11/

by aschnell＠svn2.opensuse.org

Author: aschnell Date: Fri Mar 30 17:05:38 2012 New Revision: 67839 URL: http://svn.opensuse.org/viewcvs/yast?rev=67839&view=rev Log: - moving x11 to unsupported since it was dropped in openSUSE Added: branches/unsupported/x11/ - copied from r67838, trunk/x11/ Removed: trunk/x11/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

9 years, 6 months

[yast-commit] r67838 - /tags/stable-2_22_0/sysconfig/

by lslezak＠svn2.opensuse.org

Author: lslezak Date: Fri Mar 30 16:24:03 2012 New Revision: 67838 URL: http://svn.opensuse.org/viewcvs/yast?rev=67838&view=rev Log: Created tag stable-2_22_0 for sysconfig Added: tags/stable-2_22_0/sysconfig/ - copied from r67837, trunk/sysconfig/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

9 years, 6 months

[yast-commit] r67837 - in /trunk/sysconfig: VERSION package/yast2-sysconfig.changes src/complex.ycp

by lslezak＠svn2.opensuse.org

Author: lslezak Date: Fri Mar 30 16:23:42 2012 New Revision: 67837 URL: http://svn.opensuse.org/viewcvs/yast?rev=67837&view=rev Log: - fixed displaying UTF-8 values (bnc#728588), fixed handling values containing single quotes - 2.22.0 Modified: trunk/sysconfig/VERSION trunk/sysconfig/package/yast2-sysconfig.changes trunk/sysconfig/src/complex.ycp Modified: trunk/sysconfig/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/VERSION?rev=67837&r1=6… ============================================================================== --- trunk/sysconfig/VERSION (original) +++ trunk/sysconfig/VERSION Fri Mar 30 16:23:42 2012 @@ -1 +1 @@ -2.21.2 +2.22.0 Modified: trunk/sysconfig/package/yast2-sysconfig.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/package/yast2-sysconfi… ============================================================================== --- trunk/sysconfig/package/yast2-sysconfig.changes (original) +++ trunk/sysconfig/package/yast2-sysconfig.changes Fri Mar 30 16:23:42 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 30 14:18:00 UTC 2012 - lslezak(a)suse.cz + +- fixed displaying UTF-8 values (bnc#728588), fixed handling values + containing single quotes +- 2.22.0 + +------------------------------------------------------------------- Thu Mar 29 16:09:54 CEST 2012 - jsuchome(a)suse.cz - merge proofread texts Modified: trunk/sysconfig/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/complex.ycp?rev=67… ============================================================================== --- trunk/sysconfig/src/complex.ycp (original) +++ trunk/sysconfig/src/complex.ycp Fri Mar 30 16:23:42 2012 @@ -395,37 +395,9 @@ return nil; } - string ret = ""; - integer index = 0; - boolean backslash = false; + string ret = regexpsub(input, "(.*)\\([^$].*)", "\\1\\2"); - while (index < size(input)) - { - string ch = substring(input, index, 1); - string ch_1 = substring(input, index + 1, 1); - - if (backslash == false) - { - // don't remove backslash before \$ (#34809) - if (ch == "\\" && ch_1 != nil && ch_1 != "$") - { - backslash = true; - } - else - { - ret = ret + ch; - } - } - else - { - ret = ret + ch; - backslash = false; - } - - index = index + 1; - } - - return ret; + return (ret == nil) ? input : ret; } /** @@ -444,7 +416,7 @@ value = (haskey(description, "Default")) ? description["Default"]:"" : ""; } - if (description["actions","SingleQt"]:"" == "") + if (description["actions","SingleQt"]:"" == "1") { new_value = backslash_remove(new_value); value = backslash_remove(value); @@ -608,7 +580,7 @@ map d = Sysconfig::get_description(selected_variable); // check whether single quotes are used in the configuration file - if (d["actions", "SingleQt"]:"" == "") + if (d["actions", "SingleQt"]:"" == "1") { new_value = backslash_add(new_value); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

9 years, 6 months

[yast-commit] r67836 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes

by snwint＠svn2.opensuse.org

Author: snwint Date: Fri Mar 30 13:06:44 2012 New Revision: 67836 URL: http://svn.opensuse.org/viewcvs/yast?rev=67836&view=rev Log: - 2.23.1 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=67836&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Fri Mar 30 13:06:44 2012 @@ -1 +1 @@ -2.23.0 +2.23.1 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Mar 30 13:06:44 2012 @@ -3,6 +3,7 @@ - add kernel parameters (detected necessary and user specfied one during installation) to grub2's config file (bnc#752939) +- 2.23.1 ------------------------------------------------------------------- Thu Mar 22 10:56:28 UTC 2012 - mchang(a)suse.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

9 years, 6 months

[yast-commit] r67835 - in /trunk/bootloader: package/yast2-bootloader.changes src/modules/BootGRUB2.ycp src/modules/BootGRUB2EFI.ycp

by snwint＠svn2.opensuse.org

Author: snwint Date: Fri Mar 30 13:05:55 2012 New Revision: 67835 URL: http://svn.opensuse.org/viewcvs/yast?rev=67835&view=rev Log: - add kernel parameters (detected necessary and user specfied one during installation) to grub2's config file (bnc#752939) Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootGRUB2.ycp trunk/bootloader/src/modules/BootGRUB2EFI.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Mar 30 13:05:55 2012 @@ -1,6 +1,12 @@ ------------------------------------------------------------------- Thu Mar 22 10:56:28 UTC 2012 - mchang(a)suse.com +- add kernel parameters (detected necessary and user specfied one during + installation) to grub2's config file (bnc#752939) + +------------------------------------------------------------------- +Thu Mar 22 10:56:28 UTC 2012 - mchang(a)suse.com + - add new grub2-efi module to support booting on UEFI firmware. ------------------------------------------------------------------- Modified: trunk/bootloader/src/modules/BootGRUB2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB2… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB2.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB2.ycp Fri Mar 30 13:05:55 2012 @@ -24,7 +24,7 @@ textdomain "bootloader"; -import "Arch"; +import "BootArch"; import "BootCommon"; import "BootStorage"; import "Kernel"; @@ -122,6 +122,30 @@ global define void Propose () { y2milestone ("Proposed globals: %1", BootCommon::globals); grub_LocationProposal (); + + map<string, integer> swap_sizes = BootCommon::getSwapPartitions (); + list<string> swap_parts = (list<string>) + maplist (string name, integer size, swap_sizes, ``(name)); + swap_parts = sort (string a, string b, swap_parts, + ``(swap_sizes[a]:0 > swap_sizes[b]:0) + ); + + string largest_swap_part = swap_parts[0]:""; + + string resume = BootArch::ResumeAvailable () + ? largest_swap_part + : ""; + // try to use label or udev id for device name... FATE #302219 + if ((resume != "") && (resume != nil)) + resume = BootStorage::Dev2MountByDev(resume); + BootCommon::globals["append"] = BootArch::DefaultKernelParams (resume); + + // Let grub2 scripts detects correct root= for us. :) + // BootCommon::globals["root"] = BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice); + if (BootArch::VgaAvailable () && Kernel::GetVgaType () != "") + { + BootCommon::globals["vgamode"] = Kernel::GetVgaType (); + } } Modified: trunk/bootloader/src/modules/BootGRUB2EFI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB2… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB2EFI.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB2EFI.ycp Fri Mar 30 13:05:55 2012 @@ -24,7 +24,7 @@ textdomain "bootloader"; -import "Arch"; +import "BootArch"; import "BootCommon"; import "BootStorage"; import "Kernel"; @@ -116,6 +116,30 @@ global define void Propose () { y2milestone ("Proposed globals: %1", BootCommon::globals); + + map<string, integer> swap_sizes = BootCommon::getSwapPartitions (); + list<string> swap_parts = (list<string>) + maplist (string name, integer size, swap_sizes, ``(name)); + swap_parts = sort (string a, string b, swap_parts, + ``(swap_sizes[a]:0 > swap_sizes[b]:0) + ); + + string largest_swap_part = swap_parts[0]:""; + + string resume = BootArch::ResumeAvailable () + ? largest_swap_part + : ""; + // try to use label or udev id for device name... FATE #302219 + if ((resume != "") && (resume != nil)) + resume = BootStorage::Dev2MountByDev(resume); + BootCommon::globals["append"] = BootArch::DefaultKernelParams (resume); + + // Let grub2 scripts detects correct root= for us. :) + // BootCommon::globals["root"] = BootStorage::Dev2MountByDev(BootStorage::RootPartitionDevice); + if (BootArch::VgaAvailable () && Kernel::GetVgaType () != "") + { + BootCommon::globals["vgamode"] = Kernel::GetVgaType (); + } } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

9 years, 6 months

[yast-commit] r67834 - /trunk/bootloader/src/modules/BootGRUB2EFI.ycp

by snwint＠svn2.opensuse.org

Author: snwint Date: Fri Mar 30 13:03:38 2012 New Revision: 67834 URL: http://svn.opensuse.org/viewcvs/yast?rev=67834&view=rev Log: - the new module Added: trunk/bootloader/src/modules/BootGRUB2EFI.ycp Added: trunk/bootloader/src/modules/BootGRUB2EFI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB2… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB2EFI.ycp (added) +++ trunk/bootloader/src/modules/BootGRUB2EFI.ycp Fri Mar 30 13:03:38 2012 @@ -0,0 +1,189 @@ +/** + * File: + * modules/BootGRUB2EFI.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Module containing specific functions for GRUB2EFI configuration + * and installation + * + * Authors: + * Jiri Srain <jsrain(a)suse.cz> + * Joachim Plack <jplack(a)suse.de> + * Olaf Dabrunz <od(a)suse.de> + * Philipp Thomas <pth(a)suse.de> + * + * $Id: BootGRUB2EFI.ycp 63508 2011-03-04 12:53:27Z jreidinger $ + * + */ + +{ +module "BootGRUB2EFI"; + +textdomain "bootloader"; + +import "Arch"; +import "BootCommon"; +import "BootStorage"; +import "Kernel"; +import "Mode"; +import "Stage"; +import "Storage"; +import "StorageDevices"; +import "Pkg"; +import "HTML"; + +// includes +// for shared some routines with grub +// include "bootloader/grub/misc.ycp"; +// for simplified widgets than other +// include "bootloader/grub2efi/dialogs.ycp"; +// general functions + +/** + * Read settings from disk + * @param reread boolean true to force reread settings from system + * @param avoid_reading_device_map do not read new device map from file, use + * internal data + * @return boolean true on success + */ +global boolean Read (boolean reread, boolean avoid_reading_device_map) { + BootCommon::InitializeLibrary (reread, "grub2-efi"); + if (reread) { + BootCommon::ReadFiles (avoid_reading_device_map); + } + // TODO: check if necessary for grub2efi + // grub_DetectDisks (); + boolean ret = BootCommon::Read (false, avoid_reading_device_map); + + // TODO: check if necessary for grub2 + // refresh device map if not read + // if (BootStorage::device_mapping == nil + // || size (BootStorage::device_mapping) == 0) + // { + // BootStorage::ProposeDeviceMap (); + // } + + return ret; +} + +/** + * Update read settings to new version of configuration files + */ +global define void Update () { + Read (true, true); + + //we don't handle sections, grub2 section create them for us + //BootCommon::UpdateSections (); + BootCommon::UpdateGlobals (); +} + +/** + * Write bootloader settings to disk + * @return boolean true on success + */ +global define boolean Write () { + + boolean ret = BootCommon::UpdateBootloader (); + + if (BootCommon::location_changed) { + boolean grub_ret = BootCommon::InitializeBootloader (); + if (grub_ret == nil) + grub_ret = false; + + y2milestone ("GRUB2EFI return value: %1", grub_ret); + ret = ret && grub_ret; + } + + return ret; +} + +/** + * Reset bootloader settings + * @param init boolean true to repropose also device map + */ +global define void Reset (boolean init) { + if (Mode::autoinst ()) + return; + BootCommon::Reset (init); +} + +/** + * Propose bootloader settings + */ + +global define void Propose () { + y2milestone ("Proposed globals: %1", BootCommon::globals); +} + +/** + * Display bootloader summary + * @return a list of summary lines + */ + +global define list<string> Summary () { + list<string> result = [ sformat (_("Boot Loader Type: %1"), + BootCommon::getLoaderName (BootCommon::getLoaderType (false), `summary)) ]; + list<string> locations = []; + + return result; +} + +/** + * Return map of provided functions + * @return a map of functions (eg. $["write":BootGRUB2EFI::Write]) + */ +global map<string, any> GetFunctions () { + return $[ + "read" : Read, + "reset" : Reset, + "propose" : Propose, + "summary" : Summary, + "update" : Update, + #TODO grub2widgets + #"widgets" : grub2Widgets, + "widgets" : $[], + "write" : Write, + ]; +} + + +/** + * Initializer of GRUB2EFI bootloader + */ +global define void Initializer () { + y2milestone ("Called GRUB2EFI initializer"); + BootCommon::current_bootloader_attribs = $[ + "propose" : false, + "read" : false, + "scratch" : false, + "restore_mbr" : false, + "bootloader_on_disk" : false, + ]; +} + +/** + * Constructor + */ +global define void BootGRUB2EFI () { + BootCommon::bootloader_attribs["grub2-efi"] = $[ + "required_packages" : ["grub2-efi"], + "loader_name" : "GRUB2-EFI", + "initializer" : BootGRUB2EFI::Initializer, + ]; +} + +} // EOF + +/* + * Local variables: + * mode: ycp + * mode: font-lock + * mode: auto-fill + * indent-level: 4 + * fill-column: 78 + * End: + */ + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

9 years, 6 months

[yast-commit] r67833 - in /trunk/bootloader: package/ src/modules/ src/routines/

by snwint＠svn2.opensuse.org

Author: snwint Date: Fri Mar 30 13:02:53 2012 New Revision: 67833 URL: http://svn.opensuse.org/viewcvs/yast?rev=67833&view=rev Log: - add new grub2-efi module to support booting on UEFI firmware Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootSupportCheck.ycp trunk/bootloader/src/modules/Makefile.am trunk/bootloader/src/routines/dialogs.ycp trunk/bootloader/src/routines/global_widgets.ycp trunk/bootloader/src/routines/switcher.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri Mar 30 13:02:53 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 22 10:56:28 UTC 2012 - mchang(a)suse.com + +- add new grub2-efi module to support booting on UEFI firmware. + +------------------------------------------------------------------- Wed Mar 14 15:43:44 CET 2012 - aschnell(a)suse.de - adapted ssh command for 2nd stage ssh installation (bnc#745340) 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 Mar 30 13:02:53 2012 @@ -187,7 +187,7 @@ /** * type of bootloader to configure/being configured - * shall be one of "lilo", "grub", "elilo", "ppc", "zipl", "grub2" + * shall be one of "lilo", "grub", "elilo", "ppc", "zipl", "grub2", "grub2-efi" */ string loader_type = nil; @@ -289,7 +289,7 @@ * List of all supported bootloaders */ global list<string> bootloaders = ["lilo", "grub", "elilo", - "zipl", "ppc", "grub2"]; + "zipl", "ppc", "grub2", "grub2-efi"]; /** FATE#305008: Failover boot configurations for md arrays with redundancy * if true enable redundancy for md array @@ -1059,7 +1059,9 @@ } if ((Arch::i386() || Arch::x86_64()) && Linuxrc::InstallInf("EFI") == "1") { - loader_type = "elilo"; + // use grub2-efi as default bootloader for x86_64/i386 EFI + // previously we use elilo + loader_type = "grub2-efi"; } loader_type = SupportedLoader (loader_type); @@ -1139,7 +1141,7 @@ global define list<string> getBootloaders () { if (Mode::config ()) { - return ["grub", "lilo", "elilo", "zipl", "ppc", "grub2", "default", "none"]; + return ["grub", "lilo", "elilo", "zipl", "ppc", "grub2", "grub2-efi", "default", "none"]; } list<string> ret = [ getLoaderType (false), @@ -1149,7 +1151,7 @@ { ret = (list<string>)merge (ret, ["lilo", "grub", "grub2"]); if (Arch::x86_64 ()) - ret = (list<string>)merge (ret, ["elilo"]); + ret = (list<string>)merge (ret, ["elilo", "grub2-efi"]); } // in order not to display it twice when "none" is selected ret = filter (string l, ret, { Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSuppo… ============================================================================== --- trunk/bootloader/src/modules/BootSupportCheck.ycp (original) +++ trunk/bootloader/src/modules/BootSupportCheck.ycp Fri Mar 30 13:02:53 2012 @@ -74,7 +74,7 @@ * Check that bootloader is known and supported */ boolean KnownLoader () { - if (! contains (["grub", "grub2", "elilo", "ppc", "zipl", "none"], Bootloader::getLoaderType ())) + if (! contains (["grub", "grub2", "grub2-efi", "elilo", "ppc", "zipl", "none"], Bootloader::getLoaderType ())) { if (Bootloader::getLoaderType () != "lilo") @@ -122,7 +122,7 @@ return true; if (Arch::i386() || Arch::x86_64()) { if (checkElilo()) { - if (lt == "elilo") + if (lt == "elilo" || lt == "grub2-efi") return true; } else { if ((lt == "grub") || (lt == "lilo") || (lt == "grub2")) @@ -304,6 +304,13 @@ } /** + * GRUB2EFI-related check + */ +global boolean GRUB2EFI () { + return true; +} + +/** * ELILO related check */ boolean ELILO () { @@ -357,6 +364,8 @@ supported = ZIPL () && supported; else if (lt == "grub2") supported = GRUB2 () && supported; + else if (lt == "grub2-efi") + supported = GRUB2EFI () && supported; y2milestone ("Configuration supported: %1", supported); return supported; Modified: trunk/bootloader/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Makefile.… ============================================================================== --- trunk/bootloader/src/modules/Makefile.am (original) +++ trunk/bootloader/src/modules/Makefile.am Fri Mar 30 13:02:53 2012 @@ -12,6 +12,7 @@ BootELILO.ycp \ BootGRUB.ycp \ BootGRUB2.ycp \ + BootGRUB2EFI.ycp \ BootLILO.ycp \ BootPOWERLILO.ycp \ BootZIPL.ycp \ Modified: trunk/bootloader/src/routines/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/dialogs.… ============================================================================== --- trunk/bootloader/src/routines/dialogs.ycp (original) +++ trunk/bootloader/src/routines/dialogs.ycp Fri Mar 30 13:02:53 2012 @@ -84,7 +84,7 @@ string lt = Bootloader::getLoaderType (); term contents = `VBox ( "tab", - (lt == "grub2") + (lt == "grub2" || lt == "grub2-efi") ? nil : `Right ("adv_button") ); @@ -101,7 +101,7 @@ } // F#300779: end - list<string> widget_names = (lt == "grub2") + list<string> widget_names = (lt == "grub2" || lt == "grub2-efi") ? ["tab"] : ["tab", "adv_button"]; map<string,map<string,any> > widget_descr = $[]; @@ -109,12 +109,12 @@ widget_descr = (map<string,map<string,any> >) union (CommonGlobalWidgets (), Bootloader::blWidgetMaps ()); widget_descr["tab"] = CWMTab::CreateWidget($[ - "tab_order": (lt == "grub2") + "tab_order": (lt == "grub2" || lt == "grub2-efi") ? ["installation"] : ["sections", "installation"], "tabs": TabsDescr (), "widget_descr": widget_descr, - "initial_tab" : (lt == "grub2") + "initial_tab" : (lt == "grub2" || lt == "grub2-efi") ? "installation" : return_tab ]); Modified: trunk/bootloader/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/global_w… ============================================================================== --- trunk/bootloader/src/routines/global_widgets.ycp (original) +++ trunk/bootloader/src/routines/global_widgets.ycp Fri Mar 30 13:02:53 2012 @@ -330,6 +330,22 @@ return `redraw; } + if (new_bl == "grub2-efi") { + if (Popup::ContinueCancel (_(" +The grub2-efi is still under develope and test. + +Proceed? +"))) + { + BootCommon::other_bl[old_bl] = Bootloader::Export (); + BootCommon::setLoaderType ("grub2-efi"); + Bootloader::Propose (); + BootCommon::location_changed = true; + BootCommon::changed = true; + } + return `redraw; + } + if (Arch::x86_64 ()) { if (new_bl == "elilo") { // continue/cancel pop-up @@ -720,7 +736,7 @@ `HStretch (), `VBox ( `Label (""), - (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2") + (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2" || lt == "grub2-efi") ? `Empty() : "loader_options" ), `HSpacing (2) @@ -728,7 +744,7 @@ `VSpacing (0.4) )), `VStretch (), - (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo") + (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2-efi") ? `Empty () : "loader_location", `VStretch (), @@ -737,8 +753,8 @@ : "inst_details", `VStretch () ), `HStretch ()), - "widget_names": (lt == "none" || lt == "default" || lt=="zipl" || lt == "grub2") - ? [ "loader_type", "loader_options", "loader_location"] + "widget_names": (lt == "none" || lt == "default" || lt=="zipl" || lt == "grub2-efi") + ? [ "loader_type", "loader_options" ] : [ "loader_type", "loader_options", "loader_location", "inst_details"] ], Modified: trunk/bootloader/src/routines/switcher.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/switcher… ============================================================================== --- trunk/bootloader/src/routines/switcher.ycp (original) +++ trunk/bootloader/src/routines/switcher.ycp Fri Mar 30 13:02:53 2012 @@ -24,6 +24,7 @@ import "BootPOWERLILO"; import "BootZIPL"; import "BootGRUB2"; +import "BootGRUB2EFI"; import "BootCommon"; /** @@ -40,7 +41,8 @@ "elilo" : BootELILO::GetFunctions, "zipl" : BootZIPL::GetFunctions, "ppc" : BootPOWERLILO::GetFunctions, - "grub2" : BootGRUB2::GetFunctions + "grub2" : BootGRUB2::GetFunctions, + "grub2-efi" : BootGRUB2EFI::GetFunctions ]; map<string,any> () gf = (map<string,any>())(bl_functions[bootloader]:nil); if (gf == nil) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

9 years, 6 months

[yast-commit] r67832 - in /trunk/storage: package/ storage/src/include/

by aschnell＠svn2.opensuse.org

Author: aschnell Date: Thu Mar 29 18:34:11 2012 New Revision: 67832 URL: http://svn.opensuse.org/viewcvs/yast?rev=67832&view=rev Log: - improved mount checks and feedback during resize (bnc#732766) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_check_generated.ycp trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Mar 29 18:34:11 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 18:30:25 CEST 2012 - aschnell(a)suse.de + +- improved mount checks and feedback during resize (bnc#732766) + +------------------------------------------------------------------- Thu Mar 29 12:14:35 CEST 2012 - fehr(a)suse.de - patch proofread text back into ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Thu Mar 29 18:34:11 2012 @@ -585,49 +585,10 @@ if( !installation ) { - string mounts = Storage::DeviceMounted( part_name ); - if( mounts != "" ) - { - // popup text %1 is directory name - string message = sformat(_("The selected device is currently mounted on %1. -We *strongly* recommend to unmount it manually -before deleting it. - -Click Cancel unless you know exactly what you are doing. - -If you proceed, YaST will try unmounting before deleting it. -"), mounts ); - - - if( !Popup::ContinueCancel(message)) - { - return false; - } - else - { - symbol ret = `none; - do - { - if( !Storage::Umount( part_name ) ) - { - // popup text %1 is directory name - message = sformat(_("Unmount of %1 failed. -Remove the device anyway? -"), mounts ); - ret = Popup::AnyQuestion3( Label::WarningMsg(), message, - Label::YesButton(), - Label::NoButton(), - // button text - _("&Retry umount"), - `focus_yes ); - } - } - while( ret == `retry ); - if( ret == `no ) - return false; - } - } + if (!TryUmount(part_name, _("It cannot be deleted while mounted."), true)) + return false; } + if( !installation && curr_part["type"]:`unknown==`logical ) { boolean ok = true; Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Thu Mar 29 18:34:11 2012 @@ -1102,18 +1102,6 @@ return( ret ); } -define void FsysCannotResizeMountPopup( boolean lvm, string mount ) - ``{ - // %1 is either replaced by "logical volume" or by "partition" - string txt = sformat( _(" -The file system is currently mounted on %1. -It is not possible to resize the file system while it is mounted. - -Unmount the file system and retry resizing. -"), - mount ); - Popup::Error( txt ); - } define boolean FsysShrinkReiserWarning( boolean lvm ) ``{ Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Thu Mar 29 18:34:11 2012 @@ -820,30 +820,81 @@ } -define boolean CheckResizePossible( boolean ask, boolean lvm, integer resize, - symbol fsys, string mount ) - ``{ - map poss = FileSystems::IsResizable( fsys ); +boolean TryUmount(string device, string text, boolean allow_ignore) +{ + while (true) + { + string mountpoint = Storage::DeviceMounted(device); + if (isempty(mountpoint)) + return true; + + if (allow_ignore) + { + string full_text = sformat(_("The file system is currently mounted on %1."), mountpoint) + "\n\n" + + _("You can try to unmount it now, continue without unmounting or cancel. +Click Cancel unless you know exactly what you are doing."); + + symbol ret = Popup::AnyQuestion3(Label::WarningMsg(), full_text, + Label::ContinueButton(), + Label::CancelButton(), + // button text + _("Unmount"), + `focus_no); + + if (ret == `no) + return false; + + if (ret == `yes) + return true; + } + else + { + string full_text = sformat(_("The file system is currently mounted on %1."), mountpoint) + "\n\n" + + _("You can try to unmount it now or cancel. +Click Cancel unless you know exactly what you are doing."); + + boolean ret = Popup::AnyQuestion(Label::WarningMsg(), full_text, + // button text + _("Unmount"), + Label::CancelButton(), `focus_no); + + if (ret == false) + return false; + } + + if (Storage::Umount(device)) + return true; + } +} + + +boolean CheckResizePossible(string device, boolean ask, boolean lvm, integer resize, + symbol fsys) +{ + map<string, boolean> poss = FileSystems::IsResizable(fsys); + string mountpoint = Storage::DeviceMounted(device); + boolean ret = true; - y2milestone( "CheckResizePossible resize %1 ask %2 lvm %3 fsys %4 mount %5", - resize, ask, lvm, fsys, mount ); - if( size(mount)>0 && !Stage::initial() && resize < 0 && + y2milestone("CheckResizePossible device:%1 ask:%2 lvm:%3 resize:%4 fsys:%5", + device, ask, lvm, resize, fsys); + + if( !isempty(mountpoint) && !Stage::initial() && resize < 0 && !poss["mount_shrink"]:false && poss["shrink"]:false ) { - FsysCannotResizeMountPopup( lvm, mount ); - ret = false; + if (!TryUmount(device, _("It is not possible to shrink the file system while it is mounted."), true)) + ret = false; } - else if( size(mount)>0 && !Stage::initial() && resize > 0 && + else if( !isempty(mountpoint) && !Stage::initial() && resize > 0 && !poss["mount_extend"]:false && poss["extend"]:false ) { - FsysCannotResizeMountPopup( lvm, mount ); - ret = false; + if (!TryUmount(device, _("It is not possible to extend the file system while it is mounted."), true)) + ret = false; } - else if( size(mount)>0 && !Stage::initial() && resize != 0 && !lvm ) + else if( !isempty(mountpoint) && !Stage::initial() && resize != 0 && !lvm ) { - FsysCannotResizeMountPopup( lvm, mount ); - ret = false; + if (!TryUmount(device, _("It is not possible to resize the file system while it is mounted."), true)) + ret = false; } else if( resize < 0 && !poss["shrink"]:false ) { @@ -858,8 +909,7 @@ ret = FsysCannotGrowPopup( ask, lvm ); } y2milestone( "ret %1", ret ); - return( ret ); - } - + return ret; +} } Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Thu Mar 29 18:34:11 2012 @@ -648,19 +648,22 @@ return false; } - integer cyl_size = 0; integer free_cyl_after = 0; string device = data["device"]:"error"; symbol used_fs = data["used_fs"]:`none; - integer used_k = FileSystems::MinFsSizeK(used_fs); + if (!data["format"]:false) { if (used_fs != `swap) { + if (used_fs == `ntfs && !TryUmount(device, _("It is not possible to check whether a NTFS +can be resized while it is mounted."), false)) + return false; + map free_data = Storage::GetFreeSpace(device, used_fs, true); if (isempty(free_data) || !free_data["ok"]:false) { @@ -834,12 +837,11 @@ if (size_k != old_size_k) { - string mountpoint = data["inactive"]:false ? "" : data["mount"]:""; + string mountpoint = Storage::DeviceMounted(device); boolean lvm = data["type"]:`unknown == `lvm; - //1 - ask & be interactive, 2 - we are on lvm, 3 - cyl.diff, 4 - filesystem, 5 - mountpoint if (!data["format"]:false && - !CheckResizePossible(false, lvm, size_k - old_size_k, used_fs, mountpoint)) + !CheckResizePossible(device, false, lvm, size_k - old_size_k, used_fs)) { //FIXME: To check whether the part. can be resized only //after user tries to do that is stupid - in some cases -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

9 years, 6 months

[yast-commit] r67831 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_check_generated.ycp

by fehr＠svn2.opensuse.org

Author: fehr Date: Thu Mar 29 18:08:31 2012 New Revision: 67831 URL: http://svn.opensuse.org/viewcvs/yast?rev=67831&view=rev Log: patch proofread text back into ycp Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_check_generated.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Mar 29 18:08:31 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Mar 29 12:14:35 CEST 2012 - fehr(a)suse.de +- patch proofread text back into ycp - prevent invalid size values in tmpfs size (bnc#754326) ------------------------------------------------------------------- Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Thu Mar 29 18:08:31 2012 @@ -216,10 +216,9 @@ if( fat_system_mount || show_all_popups ) { // popup text - string message = _("You tried to mount a fat partition to one of -the following mount points: / /usr /home /opt /var. This will very likely -cause problems. Use a Linux file system, such as ext3 or ext4, for these mount -points. + string message = _("You tried to mount a FAT partition to one of the following mount +points: /, /usr, /home, /opt or /var. This will very likely cause problems. +Use a Linux file system, such as ext3 or ext4, for these mount points. Really use this setup? "); @@ -231,7 +230,7 @@ if( fat_system_boot || show_all_popups ) { // popup text - string message = _("You tried to mount a fat partition to the + string message = _("You tried to mount a FAT partition to the mount point /boot. This will very likely cause problems. Use a Linux file system, such as ext3 or ext4, for this mount point. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

9 years, 6 months

[yast-commit] r67830 - /branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp

by fehr＠svn2.opensuse.org

Author: fehr Date: Thu Mar 29 18:01:05 2012 New Revision: 67830 URL: http://svn.opensuse.org/viewcvs/yast?rev=67830&view=rev Log: remove superfluous lvm_ui_lib.ycp Removed: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/lvm_ui_lib.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

9 years, 6 months

Jump to page:

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

YaST Commits March 2012