Mailinglist Archive: yast-commit (396 mails)

< Previous Next >
[yast-commit] r65114 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/routines/misc.ycp
Author: snwint
Date: Mon Aug 1 18:18:57 2011
New Revision: 65114

URL: http://svn.opensuse.org/viewcvs/yast?rev=65114&view=rev
Log:
- yast2-storage uses fake uuids for btrfs handling; adjust our code

Modified:
branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION
branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes
branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp

Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION?rev=65114&r1=65113&r2=65114&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Mon Aug 1 18:18:57 2011
@@ -1 +1 @@
-2.17.74
+2.17.75

Modified:
branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes?rev=65114&r1=65113&r2=65114&view=diff
==============================================================================
---
branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes
(original)
+++
branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes
Mon Aug 1 18:18:57 2011
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Aug 1 18:16:07 CEST 2011 - snwint@xxxxxxx
+
+- yast2-storage uses fake uuids for btrfs handling; adjust our code
+- 2.17.75
+
+-------------------------------------------------------------------
Tue Jul 19 14:13:52 CEST 2011 - snwint@xxxxxxx

- fix using uuid names (bnc #594482, bnc #687878, bnc #704101)

Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp?rev=65114&r1=65113&r2=65114&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Mon Aug
1 18:18:57 2011
@@ -220,7 +220,8 @@
BootCommon::all_devices_created = 1;
}
// map partition by uuid
- if ((p["uuid"]:nil != "") && (p["uuid"]:nil != nil))
+ // watch out for fake uuids (shorter than 8 chars)
+ if (size(p["uuid"]:"") > 8)
{
dev_by_something =
"/dev/disk/by-uuid/"+p["uuid"]:"";
uuid_partitions[dev_by_something]=
p["device"]:"";
@@ -827,7 +828,8 @@
case (`uuid):
// partitions
partition = partitions[dev]:$[];
- if ((partition["uuid"]:nil != nil) &&
(partition["uuid"]:nil != ""))
+ // watch out for fake uuids (shorter than 8 chars)
+ if (size(partition["uuid"]:"") > 8)
{
ret = sformat ("/dev/disk/by-uuid/%1",
partition["uuid"]:"");
y2milestone ("Device name: %1 is converted to
uuid: %2", dev, ret);
@@ -915,8 +917,9 @@
mountby = (symbol) partitions[dev, "mountby"]:nil;
if ( mountby == `uuid )
{
+ // watch out for fake uuids (shorter than 8 chars)
return sformat ("%1 (mount by UUID: %2)", dev,
- partitions[dev, "uuid"]:nil != nil ?
+ size(partitions[dev, "uuid"]:"") > 8 ?
partitions[dev, "uuid"]:"" :
"<UUID to be created later during format>");
} else if ( mountby == `label )

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages