Author: aschnell
Date: Wed May 9 11:37:30 2012
New Revision: 68111
URL: http://svn.opensuse.org/viewcvs/yast?rev=68111&view=rev
Log:
- fixed available mount-by methods for newly created partitions
Modified:
branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes
branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-dialogs.ycp
branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp
Modified: branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes?rev=68111&r1=68110&r2=68111&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes (original)
+++ branches/SuSE-Code-11-SP3-Branch/storage/package/yast2-storage.changes Wed May 9 11:37:30 2012
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed May 09 11:06:59 CEST 2012 - aschnell@suse.de
+
+- fixed available mount-by methods for newly created partitions
+
+-------------------------------------------------------------------
Tue May 8 13:53:07 CEST 2012 - fehr@suse.de
- fix bug formatting a mounted btrfs volume as non-btrfs (bnc#755704)
Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-dialogs.ycp?rev=68111&r1=68110&r2=68111&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-dialogs.ycp (original)
+++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-dialogs.ycp Wed May 9 11:37:30 2012
@@ -70,6 +70,18 @@
map r = Storage::NextPartition(data["disk_device"]:"", data["type"]:`none);
data["device"] = r["device"]:"";
+ if (haskey(data, "disk_udev_id"))
+ {
+ data["udev_id"] = maplist(string s, data["disk_udev_id"]:[], {
+ return sformat("%1-part%2", s, r["nr"]:0);
+ });
+ }
+
+ if (haskey(data, "disk_udev_path"))
+ {
+ data["udev_path"] = sformat("%1-part%2", data["disk_udev_path"]:"", r["nr"]:0);
+ }
+
if (data["type"]:`unknown == `extended)
{
data["fsid"] = Partitions::fsid_extended_win;
@@ -305,6 +317,18 @@
{
map r = Storage::NextPartition(data["disk_device"]:"", data["type"]:`none);
data["device"] = r["device"]:"";
+
+ if (haskey(data, "disk_udev_id"))
+ {
+ data["udev_id"] = maplist(string s, data["disk_udev_id"]:[], {
+ return sformat("%1-part%2", s, r["nr"]:0);
+ });
+ }
+
+ if (haskey(data, "disk_udev_path"))
+ {
+ data["udev_path"] = sformat("%1-part%2", data["disk_udev_path"]:"", r["nr"]:0);
+ }
}
// dialog title
Modified: branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp?rev=68111&r1=68110&r2=68111&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp (original)
+++ branches/SuSE-Code-11-SP3-Branch/storage/storage/src/include/ep-hd-lib.ycp Wed May 9 11:37:30 2012
@@ -215,7 +215,7 @@
map slots = GetPossibleSlots(disk, disk_device);
- if (size(slots) > 0)
+ if (!isempty(slots))
{
map