Author: aschnell
Date: Tue Mar 16 13:11:33 2010
New Revision: 61330
URL: http://svn.opensuse.org/viewcvs/yast?rev=61330&view=rev
Log:
- handle udev names for partition with installation source (bnc #582717)
Modified:
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/modules/FileSystems.ycp
trunk/storage/storage/src/modules/Storage.ycp
Modified: trunk/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=61330&r1=61329&r2=61330&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Tue Mar 16 13:11:33 2010
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Mar 16 13:07:13 CET 2010 - aschnell@suse.de
+
+- handle udev names for partition with installation source (bnc
+ #582717)
+
+-------------------------------------------------------------------
Tue Mar 09 14:14:55 CET 2010 - aschnell@suse.de
- mark messages for translation (bnc #580884)
Modified: trunk/storage/storage/src/modules/FileSystems.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=61330&r1=61329&r2=61330&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/FileSystems.ycp (original)
+++ trunk/storage/storage/src/modules/FileSystems.ycp Tue Mar 16 13:11:33 2010
@@ -1259,6 +1259,7 @@
fst_default = fst_default + ",codepage=" + code;
}
}
+
any dp = LibStorage::ContVolInfo::new("LibStorage::ContVolInfo");
string dev = part["device"]:"";
LibStorage::StorageInterface::getContVolInfo(sint, dev, dp);
@@ -1279,6 +1280,7 @@
}
}
}
+
y2milestone( "DefaultFstabOptions dev %3 fsys %1 is %2", fsys, fst_default, dev );
return( fst_default );
}
Modified: trunk/storage/storage/src/modules/Storage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=61330&r1=61329&r2=61330&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Tue Mar 16 13:11:33 2010
@@ -68,6 +68,7 @@
import "LibStorage::PartitionSlotInfo";
import "LibStorage::CommitInfo";
import "LibStorage::DlabelCapabilities";
+ import "LibStorage::ContVolInfo";
import "LibStorage::ResizeInfo";
import "LibStorage::ContentInfo";
import "LibStorage::Environment";
@@ -185,7 +186,8 @@
`CT_NFS : 8 ];
list<string> hw_packages = [];
-string part_insts = "";
+
+string part_insts = nil;
global boolean IsKernelDeviceName(string device)
@@ -2020,21 +2022,49 @@
}
if( Stage::initial() )
{
- string inst = (string) SCR::Read( .etc.install_inf.Partition );
- if (inst != nil && !isempty(inst))
- {
- part_insts = "/dev/" + inst;
- y2milestone( "Storage .etc.install_inf.Partition \"%1\" part_insts:%2",
- inst, part_insts );
- }
Storage::SetPartMode( "CUSTOM" );
Storage::SetPartProposalActive( false );
}
}
+ global boolean GetContVolInfo(string device, map