August 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r58266 - /trunk/storage/package/yast2-storage.changes
by aschnell＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: aschnell Date: Mon Aug 3 18:57:14 2009 New Revision: 58266 URL: http://svn.opensuse.org/viewcvs/yast?rev=58266&view=rev Log: - unfortunately people must still adapt to machines not the other way around Modified: trunk/storage/package/yast2-storage.changes 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 Mon Aug 3 18:57:14 2009 @@ -7,7 +7,7 @@ Fri Jul 31 12:50:36 CEST 2009 - aschnell(a)suse.de - readded warning when trying to edit/delete partitions used for - installation (bug #445484) + installation (bug#445484) ------------------------------------------------------------------- Fri Jul 31 11:02:57 CEST 2009 - aschnell(a)suse.de -- 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] <web-client> master : create validate html to pass tidy (still problem with link inside div)
by Josef Reidinger 03 Aug '09

03 Aug '09

ref: refs/heads/master commit a5383c76237aa7220a83a71770a90cc52a23ab9d Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Aug 3 18:34:48 2009 +0200 create validate html to pass tidy (still problem with link inside div) --- .../systemtime/app/views/system_time/index.rhtml | 2 +- webclient/app/views/layouts/main.rhtml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/systemtime/app/views/system_time/index.rhtml b/plugins/systemtime/app/views/system_time/index.rhtml index 57cdf1d..c3079a8 100644 --- a/plugins/systemtime/app/views/system_time/index.rhtml +++ b/plugins/systemtime/app/views/system_time/index.rhtml @@ -13,7 +13,7 @@ <% disabled = ! @permissions[:write] %> - <div class='plugin-icon'><img src='/icons/yast-ntp-client.png'/></div> + <div class='plugin-icon'><img src='/icons/yast-ntp-client.png' alt="time module"/></div> <div class='plugin-content'> <h2><%=_("Configure timezone")%></h2> <% form_tag '/system_time/update_timezone', :class => 'container' do %> diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml index 0fdb4ad..d5327cd 100644 --- a/webclient/app/views/layouts/main.rhtml +++ b/webclient/app/views/layouts/main.rhtml @@ -72,4 +72,5 @@ </div> <div id="footer" class=""> - <div class="copy">© 2009 Novell, Inc.</di + <div class="copy">© 2009 Novell, Inc.</div> + </div> -- 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] <web-client> master : use lambda functions to reduce loops
by Josef Reidinger 03 Aug '09

03 Aug '09

ref: refs/heads/master commit 28ee8a1962bca58c25cb57ad6a1f8e26aa67b579 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Aug 3 18:34:17 2009 +0200 use lambda functions to reduce loops --- .../app/controllers/system_time_controller.rb | 32 ++++++------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/plugins/systemtime/app/controllers/system_time_controller.rb b/plugins/systemtime/app/controllers/system_time_controller.rb index eac39fb..c51a794 100644 --- a/plugins/systemtime/app/controllers/system_time_controller.rb +++ b/plugins/systemtime/app/controllers/system_time_controller.rb @@ -18,26 +18,17 @@ class SystemTimeController < ApplicationController # Fills @+valid+ field that represents valid regions with informations from # @+timezone+ field. def fill_valid_timezones - @valid.clear - @@timezones.each do |region| - @valid.push(region.name) - end + @valid = @@timezones.collect { |region| region.name } end # Fills current region name in field @+region+. Requires filled @+timezones+ # and @+timezone+ fields # throws:: Exception if current timezone is not in any known region. @+region+ # field in this case is +nil+. - def fill_current_region - @@timezones.each do |region| - region.entries.each do |entry| - if entry.id == @timezone - @region = region - return - end - end - end - raise _("Unknown timezone #{@timezone} on host") + def fill_current_region + @region = @@timezones.find { |region| + region.entries.find { |entry| entry.id==@timezone } } + raise _("Unknown timezone #{@timezone} on host") unless @region end public @@ -151,19 +142,16 @@ class SystemTimeController < ApplicationController unless systemtime return false #possible FIXME: is returnign false for AJAX correct? end - + @@timezones = systemtime.timezones end - region = "" #possible FIXME later it gets class, not a string - @@timezones.each do |r| - if r.name == params[:value] - region = r - end - end - if region == "" + region = @@timezones.find { |r| r.name == params[:value] } #possible FIXME later it gets class, not a string + + unless region return false; #possible FIXME: is returnign false for AJAX correct? end + render(:partial => 'timezones', :locals => {:region => region, :default => region.central, :disabled => ! params[:disabled]=="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] r58265 - /tags/branch-SLE-10-SP3-2_13_164/bootloader/
by juhliarik＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: juhliarik Date: Mon Aug 3 17:40:03 2009 New Revision: 58265 URL: http://svn.opensuse.org/viewcvs/yast?rev=58265&view=rev Log: Created tag branch-SLE-10-SP3-2_13_164 for bootloader Added: tags/branch-SLE-10-SP3-2_13_164/bootloader/ - copied from r58264, branches/SuSE-SLE-10-SP3-Branch/bootloader/ -- 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] r58264 - /tags/branch-SLE-10-SP3-2_13_164/
by juhliarik＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: juhliarik Date: Mon Aug 3 17:40:01 2009 New Revision: 58264 URL: http://svn.opensuse.org/viewcvs/yast?rev=58264&view=rev Log: Created tag branch-SLE-10-SP3-2_13_164 Added: tags/branch-SLE-10-SP3-2_13_164/ -- 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] r58263 - in /branches/SuSE-SLE-10-SP3-Branch/bootloader: ./ package/ src/modules/ src/routines/
by juhliarik＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: juhliarik Date: Mon Aug 3 17:39:53 2009 New Revision: 58263 URL: http://svn.opensuse.org/viewcvs/yast?rev=58263&view=rev Log: added patch for using persistent device names Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootPOWERLILO.ycp branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/lib_iface.ycp branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION Mon Aug 3 17:39:53 2009 @@ -1 +1 @@ -2.13.163 +2.13.164 Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes Mon Aug 3 17:39:53 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 31 12:28:34 CEST 2009 - juhliarik(a)suse.cz + +- added fix for using persistent device names (bnc#524547) +- 2.13.164 + +------------------------------------------------------------------- Wed Jul 29 13:53:16 CEST 2009 - juhliarik(a)suse.cz - added fix for proposal if GPT is used (bnc#525968) Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp Mon Aug 3 17:39:53 2009 @@ -648,9 +648,9 @@ */ global define map Export () { map exp = $[ - "global": globals, - "sections" : sections, - "device_map" : device_mapping, + "global": remapGlobals(globals), + "sections" : remapSections(sections, false), + "device_map" : remapDeviceMap(device_mapping), ]; if ( ! ( loader_type == "grub" ) ) { exp["repl_mbr"] = repl_mbr; @@ -783,17 +783,15 @@ InitializeLibrary (init, bl); + // convert root device names in sections to the device names indicated by + // "mountby" + sections = remapSections(sections, true); + list<map<string,string> > sects = maplist (map<string,any> s, sections, { return (map<string,string>) filter (string k, any v, s, { return is (v, string); }); }); - // convert root device names in sections to the device names indicated by - // "mountby" - sects = maplist (map<string,string> s, sects, { - s["root"] = BootCommon::Dev2MountByDev(s["root"]:""); - return s; - }); // FIXME: give mountby information to perl-Bootloader (or define some // better interface), so that perl-Bootloader can use mountby device names Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootPOWERLILO.ycp Mon Aug 3 17:39:53 2009 @@ -462,7 +462,7 @@ "image" : image_fn, "initrd" : initrd_fn, "optional" : "true", // bnc #217443 - "root" : BootCommon::RootPartitionDevice, + "root" : BootCommon::RootPartitionDevice, // bnc#524547 // "": do not include resume parameter on ppc "append" : BootArch::DefaultKernelParams (""), "__auto" : true, @@ -850,8 +850,8 @@ */ global define map Export () { map exp = $[ - "global": BootCommon::globals, - "sections" : BootCommon::sections, + "global": BootCommon::remapGlobals(BootCommon::globals), + "sections" : BootCommon::remapSections(BootCommon::sections, false), "activate" : BootCommon::activate, ]; return exp; @@ -952,6 +952,13 @@ // FIXME: set one mountpoint 'boot/boot' for every boot target means all // partitions in 'boot_<arch>_custom' and 'clone' (chrp) + // convert root device names in sections to the device names indicated by + // "mountby" + BootCommon::sections= maplist (map<string,any> s, BootCommon::sections, { + s["root"] = BootCommon::Dev2MountByDev(s["root"]:""); + return s; + }); + // ret = ret && BootCommon::SetDeviceMap (device_mapping); ret = ret && BootCommon::SetSections (BootCommon::sections); ret = ret && BootCommon::SetGlobal (my_globals); Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/lib_iface.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/lib_iface.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/lib_iface.ycp Mon Aug 3 17:39:53 2009 @@ -136,6 +136,7 @@ if (!force && loader == library_initialized) return false; + BootCommon::InitMapDevices (); y2milestone ("Initializing lib for %1", loader); System::Bootloader_API::setLoaderType (loader); y2milestone ("Putting partitioning into library"); Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/routines/misc.ycp Mon Aug 3 17:39:53 2009 @@ -49,10 +49,44 @@ global boolean DisksChanged (); global define list<string> getPartitionList(symbol type); global boolean isHVMGuest(); - + global define string Dev2MountByDev(string dev); include "bootloader/routines/i386.ycp"; + +/** + * Saved change time from target map - only for MapAllPartitions() + */ +global integer disk_change_time_InitBootloader = nil; + +/** + * Saved change time from target map - only for MapAllPartitions() + */ + +global integer disk_change_time_MapAllPartitions = nil; + + +/** + * bnc #468922 - problem with longtime running the parsing a huge number of disks + * map<string,map> the map of all partitions with info about it -> + * necessary for Dev2MountByDev() in routines/misc.ycp + */ +global map<string,map> all_partitions = $[]; + +/** + * bnc #468922 - problem with longtime running the parsing a huge number of disks + * map<string,map> target map try to minimalize calling Storage::GetTargetMap() + * + */ +map<string,map> target_map = $[]; + + +/** + * mapping all devices udev-name to kernel name + * importnat for init fucntion of perl-Bootloader + */ +global map<string, string> all_devices = $[]; + /** * return printable name of bootloader * @param bootloader string bootloader type internal string @@ -169,111 +203,488 @@ return pth; } - /** - * Converts a "/dev/disk/by-" device name to the corresponding kernel - * device name, if a mapping for this name can be found in the map from - * yast2-storage. If the given device name is not a "/dev/disk/by-" device - * name, it is left unchanged. Also, if the information about the device - * name cannot be found in the target map from yast2-storage, the device - * name is left unchanged. - * - * @param dev string device name - * @return string kernel device name - */ - global define string MountByDev2Dev(string dev) ``{ - y2milestone ("MountByDev2Dev: %1", dev); - - if (!regexpmatch(dev, "^/dev/disk/by-")) - return dev; +/** FATE #302219 - Use and choose persistent device names for disk devices + * Function prepare maps with mapping disks and partitions by uuid, id, path + * and label. + * + */ +void MapDevices() +{ + string dev_by_something = ""; map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); - - // make a map: "type/identifier" -> kernel_device_name - // e.g.: "id/scsi-SATA_ST3120813AS_3LS09W21-part5" -> "/dev/sda2" - map<string,string> partitions = $[]; - foreach (string k, map v, devices, ``{ - foreach (map p, (list<map>)(v["partitions"]:[]), ``{ - if ( haskey(p, "uuid") ) + foreach (string k, map v, devices, + { + // map disk by uuid + if ((v["uuid"]:nil != "") && (v["uuid"]:nil != nil)) { - partitions["uuid/" + p["uuid"]:""] = p["device"]:dev; + dev_by_something = "/dev/disk/by-uuid/"+v["uuid"]:""; + all_devices[dev_by_something]= k; } - if ( haskey(p, "label") ) + // map disk by path + if ((v["path"]:nil != "") && (v["path"]:nil != nil)) { - partitions["label/" + p["label"]:""] = p["device"]:dev; + dev_by_something = "/dev/disk/by-path/"+v["path"]:""; + all_devices[dev_by_something]= k; } - if ( haskey(p, "udev_id") ) + // map disk by id + if ((v["udev_id"]:nil != nil) && (v["udev_id", 0]:nil != "")) { - partitions["id/" + p["udev_id", 0]:""] = p["device"]:dev; + dev_by_something = "/dev/disk/by-id/"+v["udev_id", 0]:""; + all_devices[dev_by_something]= k; } - if ( haskey(p, "udev_path") ) + // map partitions from disk... + + foreach (map p, (list<map>)(v["partitions"]:[]), + { + // map partition by uuid + if ((p["uuid"]:nil != "") && (p["uuid"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-uuid/"+p["uuid"]:""; + all_devices[dev_by_something]= p["device"]:""; + } + + // map partition by path + if ((p["path"]:nil != "") && (p["path"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-path/"+p["path"]:""; + all_devices[dev_by_something]= p["device"]:""; + } + + // map partition by label + if ((p["label"]:nil != "") && (p["label"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-label/"+p["label"]:""; + all_devices[dev_by_something]= p["device"]:""; + } + + // map disk by id + if ((p["udev_id"]:nil != nil) && (p["udev_id", 0]:nil != "")) + { + dev_by_something = "/dev/disk/by-id/"+p["udev_id", 0]:""; + all_devices[dev_by_something]= p["device"]:""; + } + + }); // end of foreach (map p, (list<map>)(v["partitions"]:[]), + }); // end of foreach (string k, map v, devices, + + y2debug("device name mapping to kernel names: %1", all_devices); + +} + + + +/** FATE #302219 - Use and choose persistent device names for disk devices + * Converts a "/dev/disk/by-" device name to the corresponding kernel + * device name, if a mapping for this name can be found in the map from + * yast2-storage. If the given device name is not a "/dev/disk/by-" device + * name, it is left unchanged. Also, if the information about the device + * name cannot be found in the target map from yast2-storage, the device + * name is left unchanged. + * + * @param dev string device name + * @return string kernel device name + */ + +global define string MountByDev2Dev(string dev) +{ + y2milestone ("MountByDev2Dev: %1", dev); + + if (!regexpmatch(dev, "^/dev/disk/by-")) + return dev; + string ret = dev; + + // check if it is device name by id + if (haskey(all_devices, dev)) + ret = all_devices[dev]:""; + + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; +} + + + +/** + * Function remap device map to device name (/dev/sda) + * or to label (ufo_disk) + * @param map<string,string> device map + * @return map<string,string> new device map + */ + +global map<string,string> remapDeviceMap(map<string,string> device_map) +{ + symbol by_mount = nil; + + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; + if (by_mount == `label) + return device_map; + + map<string,string> ret = $[]; + // convert device names in device map to the device names by device or label + ret = mapmap (string k , string v, device_mapping, + { + return $[BootCommon::MountByDev2Dev(k) : v]; + }); + + return ret; +} + +/** + * Function remap globals settings "boot_custom" device name (/dev/sda) + * or to label (ufo_partition) + * @param map<string,string> globals + * @return map<string,string> globals + */ + +global map<string,string> remapGlobals(map<string,string> globals_set) +{ + symbol by_mount = nil; + + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; + if (by_mount == `label) + return globals_set; + + if (haskey(globals_set, "boot_custom")) + { + globals_set["boot_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_custom"]:""); + } + + if (haskey(globals_set, "boot_chrp_custom")) + { + globals_set["boot_chrp_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_chrp_custom"]:""); + } + + if (haskey(globals_set, "boot_pmac_custom")) + { + globals_set["boot_pmac_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_pmac_custom"]:""); + } + + if (haskey(globals_set, "boot_iseries_custom")) + { + globals_set["boot_iseries_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_iseries_custom"]:""); + } + + if (haskey(globals_set, "boot_prep_custom")) + { + globals_set["boot_prep_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_prep_custom"]:""); + } + return globals_set; +} + +/** + * Function remap "resume" from section (append) to device name (/dev/sda) + * or to label (ufo_partition) + * @param map<string,any> sections + * @param boolean if true convert to persistent dev name else to kernel dev name + * @return map<string,any> sections + */ + +define string remapResume(string append, boolean pers_dev_names) +{ + if ((search(append, "resume")!=nil) && (search(append, "noresume") == nil)) + { + y2milestone("append before remapping resume: %1", append); + list <string> list_append = splitstring (append, " "); + y2debug("split append to list list_append: %1", list_append); + list <string> new_append = []; + + foreach(string key, list_append, + { + if (search(key,"resume") != nil) + { + y2debug("arg resume from append: %1",key); + list <string> resume_arg = splitstring(key, "="); + string dev = resume_arg[1]:""; + y2debug("value of resume: %1",resume_arg[1]:""); + if (dev != "") + { + string resume = ""; + if (pers_dev_names) + resume = "resume="+BootCommon::Dev2MountByDev(dev); + else + resume = "resume="+BootCommon::MountByDev2Dev(dev); + y2debug("remap resume: %1",resume); + new_append = add(new_append, resume); + } else { + y2debug("adding key to new append_list: %1", key); + new_append = add(new_append, key); + } + } else { + y2debug("adding key to new append_list: %1", key); + new_append = add(new_append, key); + } + }); + + y2debug("NEW append list: %1", new_append); + string ret = mergestring(new_append, " "); + y2milestone("Append after remaping: %1", ret); + return ret; + + } else { + y2milestone("Section hasn't resume..."); + return append; + } +} + +/** + * Function remap section "root" and "resume" to device name (/dev/sda) + * or to label (ufo_partition) + * it also prepared measured files for export + * @param list<map<string,any> > list of sections + * @param boolean if true convert to persistent dev name else to kernel dev name + * @return list<map<string,any> > list of sections + */ + +global list<map<string,any> > remapSections(list<map<string,any> >sec, boolean pers_dev_names) +{ + symbol by_mount = nil; + + by_mount = Storage::GetDefaultMountBy(); + + //by_mount = `id; + if (by_mount == `label) + return sec; + + list<map<string,any> >temp_sec = []; + + // convert root and resume device names in sections to kernel device names + temp_sec = maplist (map<string,any> s, sections, + { + + if (s["root"]:"" != "") { - partitions["path/" + p["udev_path"]:""] = p["device"]:dev; + string rdev = s["root"]:""; + s["root"] = (pers_dev_names) ? Dev2MountByDev(rdev) : MountByDev2Dev(rdev); + + if (s["append"]:"" != "") + s["append"] = remapResume(s["append"]:"", pers_dev_names); + + y2debug("remapping root: %1 from section to: %2 ",rdev ,s["root"]:""); } - }); + + if (s["chainloader"]:"" != "") + s["chainloader"] = MountByDev2Dev(s["chainloader"]:""); + + return s; }); - y2milestone ("MountByDev2Dev: partitions %1", partitions); - // ident is "id/<id>", "path/<path>", "uuid/<uuid>" or "label/<label>" - string ident = regexpsub(dev, "^/dev/disk/by-(.*)", "\\1"); - y2milestone ("MountByDev2Dev: ident %1", ident); - // if exists, get the kernel name, otherwise leave unchanged - string ret = partitions[ident]:dev; + return temp_sec; +} + + - y2milestone ("MountByDev2Dev: ret %1", ret); +/** + * Init and fullfil internal data for perl-Bootloader + * + * @return true if init reset/fullfil data or false and used cached data + */ + +global boolean InitMapDevices () +{ + boolean ret = false; + if (disk_change_time_InitBootloader != Storage::GetTargetChangeTime()) + { + y2milestone("Init internal data from storage"); + MapDevices(); + disk_change_time_InitBootloader = Storage::GetTargetChangeTime(); + ret = true; + } + return ret; +} + +/** + * bnc #468922 - problem with longtime running the parsing a huge number of disks + * Function initialize BootCommon::all_partitions only if storage change + * partitioning of disk + * true if init all_partitions + */ + +boolean MapAllPartitions() +{ + boolean ret = false; + if (saved_last_change_time_from_storage != Storage::GetTargetChangeTime()) + { + // save last change time from storage for MapAllPartitions() + saved_last_change_time_from_storage = Storage::GetTargetChangeTime(); + + BootCommon::all_partitions = $[]; + BootCommon::target_map = $[]; + // get target map + BootCommon::target_map = (map<string,map>)Storage::GetTargetMap(); + // map all partitions + foreach (string k, map v, BootCommon::target_map, + { + foreach (map p, (list<map>)(v["partitions"]:[]), + { + all_partitions[p["device"]:""] = p; + }); + }); + ret = true; } - /** - * Converts a device name to the corresponding device name it should be - * mounted by, according to the "mountby" setting for the device from - * yast2-storage. As a safeguard against problems, if the "mountby" device - * name does not exist in the information from yast2-storage, it will - * fallback to the "kernel name" ("/dev/hda1"). - * - * @param dev string device name - * @return string device name according to "mountby" - */ - global define string Dev2MountByDev(string dev) ``{ + return ret; +} + +/** FATE #302219 - Use and choose persistent device names for disk devices + * Converts a device name to the corresponding device name it should be + * mounted by, according to the "mountby" setting for the device from + * yast2-storage. As a safeguard against problems, if the "mountby" device + * name does not exist in the information from yast2-storage, it will + * fallback to the "kernel name" ("/dev/sdXY"). + * + * @param dev string device name + * @return string device name according to "mountby" + */ +global define string Dev2MountByDev(string dev) +{ y2milestone ("Dev2MountByDev: %1", dev); + symbol by_mount = nil; - // ugly hack for bnc#501987 kernel panic + // ugly hack for bnc#501987 kernel panic if (isHVMGuest()) { y2milestone("skip converting device: %1 to persistent device name", dev); return dev; } - map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); - - // make a map: "/dev/hda1" -> info_map_for_this_partition - map<string,map> partitions = $[]; - foreach (string k, map v, devices, ``{ - foreach (map p, (list<map>)(v["partitions"]:[]), ``{ - partitions[p["device"]:""] = p; - }); - }); - y2debug ("Dev2MountByDev: partitions %1", partitions); + // add all_partitions to partitions + if (MapAllPartitions()) + y2milestone("Init BootCommon::all_partitions was done"); + + map<string,map> partitions = BootCommon::all_partitions; + map<string,map> devices = BootCommon::target_map; + map partition = $[]; + map device = $[]; string ret = dev; - symbol mountby = `device; - mountby = (symbol) partitions[dev, "mountby"]:nil; - if ( mountby == `uuid && partitions[dev, "uuid"]:nil != nil ) - { - ret = sformat ("/dev/disk/by-uuid/%1", partitions[dev, "uuid"]:""); - } else if ( mountby == `label && partitions[dev, "label"]:nil != nil ) - { - ret = sformat ("/dev/disk/by-label/%1", partitions[dev, "label"]:""); - } else if ( mountby == `id && partitions[dev, "udev_id"]:nil != nil ) + // bnc#510086 mountby-Option "device" from the AutoYast partitioning profile + // isnt correctly populating lilo.conf + // (`id,`uuid,`path,`device,`label) + // bnc#458018 accept different mount-by for partition + // created by user + by_mount = Storage::GetDefaultMountBy(); + //by_mount = `id; + y2milestone("Default mount by is %1", by_mount); + + if (haskey(partitions, dev)) + { + symbol partition_mount_by = (symbol) partitions[dev, "mountby"]:nil; + if ((partition_mount_by != nil)) + by_mount = partition_mount_by; + } + + if (by_mount == `device) { - ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "udev_id", 0]:""); - } else if ( mountby == `path && partitions[dev, "udev_path"]:nil != nil ) + y2milestone("Skip converting device: %1 to persistent device names because mountby is set to: %2", + dev, by_mount); + return dev; + } + + if (Arch::ppc()) { - ret = sformat ("/dev/disk/by-path/%1", partitions[dev, "udev_path"]:""); + // bnc# 524547 + if ((by_mount != `uuid ) && (by_mount != `id)) + { + by_mount = `id; + y2milestone("Adding default mount-by for ppc (`id)"); + } else { + y2milestone("PPC uses persistent device names mount-by: %1", by_mount); + } + + } + + switch(by_mount) + { + // convert to udev_id + case (`id): + // partitions + partition = partitions[dev]:$[]; + if ((partition["udev_id"]:nil != nil) && (partition["udev_id", 0]:nil != "")) + { + ret = sformat ("/dev/disk/by-id/%1", partition["udev_id", 0]:""); + y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); + return ret; + } + // disks + device = devices[dev]:$[]; + if ((device["udev_id"]:nil != nil) && (device["udev_id", 0]:nil != "")) + { + ret = sformat ("/dev/disk/by-id/%1", device["udev_id", 0]:""); + y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); + return ret; + } + break; + + // convert to uuid + case (`uuid): + // partitions + partition = partitions[dev]:$[]; + if ((partition["uuid"]:nil != nil) && (partition["uuid"]:nil != "")) + { + ret = sformat ("/dev/disk/by-uuid/%1", partition["uuid"]:""); + y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); + return ret; + } + // disks + device = devices[dev]:$[]; + if ((device["uuid"]:nil != nil) && (device["uuid"]:nil != "")) + { + ret = sformat ("/dev/disk/by-uuid/%1", device["uuid"]:""); + y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); + return ret; + } + break; + + // convert to udev_path + case (`path): + // partitions + partition = partitions[dev]:$[]; + if ((partition["udev_path"]:nil != nil) && (partition["udev_path"]:nil != "")) + { + ret = sformat ("/dev/disk/by-path/%1", partition["udev_path"]:""); + y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); + return ret; + } + // disks + device = devices[dev]:$[]; + if ((device["udev_path"]:nil != nil) && (device["udev_path"]:nil != "")) + { + ret = sformat ("/dev/disk/by-path/%1", device["udev_path"]:""); + y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); + return ret; + } + break; + + // convert to label + case (`label): + // partitions + partition = partitions[dev]:$[]; + if ((partition["label"]:nil != nil) && (partition["label"]:nil != "")) + { + ret = sformat ("/dev/disk/by-label/%1", partition["label"]:""); + y2milestone ("Device name: %1 is converted to label: %2", dev, ret); + return ret; + } + // disks + y2milestone ("Disk doesn't support labels - name: %1 is converted to label: %2", dev, ret); + return ret; + break; + + // convert to device or uknown type + default: + y2milestone ("Convert %1 to `device or unknwn type, result: %2", dev, ret); + return ret; + break; } - y2milestone ("Dev2MountByDev: ret %1", ret); return ret; - } +} + /** * Returns list of partitions with "mount by" hints. Goes through the list -- 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] r58262 - in /trunk/storage/storage/src/modules: Partitions.ycp Storage.ycp
by aschnell＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: aschnell Date: Mon Aug 3 16:58:29 2009 New Revision: 58262 URL: http://svn.opensuse.org/viewcvs/yast?rev=58262&view=rev Log: - moved function MaxSizeK() to Partitions module Modified: trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Mon Aug 3 16:58:29 2009 @@ -750,6 +750,17 @@ } + global integer MaxSizeK(string dlabel) + { + integer ret = 0; + any caps = LibStorage::DlabelCapabilities::new("LibStorage::DlabelCapabilities"); + if (LibStorage::StorageInterface::getDlabelCapabilities(sint, dlabel, caps)) + ret = LibStorage::DlabelCapabilities::swig_maxSizeK_get(caps); + y2milestone("MaxSizeK dlabel:%1 ret:%2", dlabel, ret); + return ret; + } + + global define string RdonlyText( string disk, boolean expert_partitioner ) ``{ string text = ""; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Aug 3 16:58:29 2009 @@ -2063,22 +2063,10 @@ return ret; } -global integer MaxSizeLabelK( map disk ) - { - integer ret = 0; - string dlabel = disk["label"]:""; - any caps = LibStorage::DlabelCapabilities::new("LibStorage::DlabelCapabilities"); - if (LibStorage::StorageInterface::getDlabelCapabilities(sint, dlabel, caps)) - { - ret = LibStorage::DlabelCapabilities::swig_maxSizeK_get(caps); - } - y2milestone("MaxSizeLabelK %1 is %2", dlabel, ret); - return ret; - } global integer MaxCylLabel( map disk, integer start_cyl ) { - integer ret = MaxSizeLabelK(disk); + integer ret = Partitions::MaxSizeK(disk["label"]:""); y2milestone( "MaxCylLabel val_k:%1 cyl_size:%2", ret, disk["cyl_size"]:1 ); integer cylk2 = disk["cyl_size"]:1/512; if( cylk2<2 ) -- 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] <rest-service> master : - use Array#find instead of an ugly loop...
by Ladislav Slezak 03 Aug '09

03 Aug '09

ref: refs/heads/master commit 9098066b3d75a2766953ffdaefe5ce60e5dc9b98 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Mon Aug 3 15:37:40 2009 +0200 - use Array#find instead of an ugly loop... --- .../patches/app/controllers/patches_controller.rb | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/plugins/patches/app/controllers/patches_controller.rb b/plugins/patches/app/controllers/patches_controller.rb index ad11971..c0a3d9a 100644 --- a/plugins/patches/app/controllers/patches_controller.rb +++ b/plugins/patches/app/controllers/patches_controller.rb @@ -96,17 +96,11 @@ class PatchesController < ApplicationController end def get_update (id) - patch_update = nil if @patch_updates.nil? || @patch_updates.empty? @patch_updates = get_updateList end - @patch_updates.each do |p| - if p.resolvable_id.to_s == id.to_s - patch_update = p - break - end - end - return patch_update + + @patch_updates.find { |p| p.resolvable_id.to_s == id.to_s } end def install_update (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] r58261 - /trunk/devtools/devtools/admin/all-packages
by lslezak＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: lslezak Date: Mon Aug 3 12:24:09 2009 New Revision: 58261 URL: http://svn.opensuse.org/viewcvs/yast?rev=58261&view=rev Log: - yast2-dbus-client is not needed in inst-sys Modified: trunk/devtools/devtools/admin/all-packages Modified: trunk/devtools/devtools/admin/all-packages URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/admin/all-pack… ============================================================================== --- trunk/devtools/devtools/admin/all-packages (original) +++ trunk/devtools/devtools/admin/all-packages Mon Aug 3 12:24:09 2009 @@ -72,7 +72,7 @@ yast2-slp default slp agent/browser yast2-transfer inst-sys transfer/curl agent (autoinst) yast2-xml inst-sys xml agent (autoinst) -yast2-dbus-client inst-sys DBus agent +yast2-dbus-client - DBus agent yast2-dbus-server - Yast DBus service # config packages -- 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] r58260 - /tags/branch-Code-11-2_17_14/gtk/
by tgoettlicher＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: tgoettlicher Date: Mon Aug 3 12:05:42 2009 New Revision: 58260 URL: http://svn.opensuse.org/viewcvs/yast?rev=58260&view=rev Log: Created tag branch-Code-11-2_17_14 for gtk Added: tags/branch-Code-11-2_17_14/gtk/ - copied from r58259, branches/SuSE-Code-11-Branch/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0