Author: aschnell
Date: Tue Feb 16 16:32:38 2010
New Revision: 60827
URL: http://svn.opensuse.org/viewcvs/yast?rev=60827&view=rev
Log:
- don't import mount point for installation source (bnc #577560)
Modified:
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/include/custom_part_lib.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=60827&r1=60826&r2=60827&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Tue Feb 16 16:32:38 2010
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Feb 16 16:31:17 CET 2010 - aschnell@suse.de
+
+- don't import mount point for installation source (bnc #577560)
+
+-------------------------------------------------------------------
Wed Feb 10 12:19:00 CET 2010 - fehr@suse.de
- provide name of encrypted dm device in "crypt_device" key of
Modified: trunk/storage/storage/src/include/custom_part_lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_lib.ycp?rev=60827&r1=60826&r2=60827&view=diff
==============================================================================
--- trunk/storage/storage/src/include/custom_part_lib.ycp (original)
+++ trunk/storage/storage/src/include/custom_part_lib.ycp Tue Feb 16 16:32:38 2010
@@ -996,12 +996,12 @@
* @return return ( [ targetMap, table_input ]
*
*/
-define list AddFstabToData( map targetMap, list<map> fstab )
- ``{
+list AddFstabToData(map targetMap, list<map> fstab)
+{
if( fstab == nil )
- return [targetMap] ;
+ return [ targetMap ];
- y2milestone( "AddFstabToData fstab = %1", fstab );
+ y2milestone( "AddFstabToData fstab:%1", fstab );
map new_targetMap = targetMap;
map table_input = $["tbl":[]];
@@ -1018,16 +1018,12 @@
``{
string dev_fstab = fstab_entry["device"]:"";
string mount_fstab = fstab_entry["mount"]:"";
- boolean found = false;
- if( dev_fstab == partition["device"]:"" )
- {
- found = true;
- }
- if( found )
- {
+ if (dev_fstab == partition["device"]:"" &&
+ !Storage::IsInstallationSource(partition["device"]:""))
+ {
new_partition["mount"] = mount_fstab;
- if( size(fstab_entry["fstopt"]:"")>0 &&
+ if( !isempty(fstab_entry["fstopt"]:"") &&
fstab_entry["fstopt"]:"" != "default" )
{
new_partition["fstopt"] = fstab_entry["fstopt"]:"";
@@ -1055,18 +1051,18 @@
new_targetMap[dev] = target;
});
- y2milestone( "AddFstabToData table_input %1", table_input );
- y2milestone( "AddFstabToData tbl %1", table_input["tbl"]:[] );
+ y2milestone( "AddFstabToData table_input:%1", table_input );
+ y2milestone( "AddFstabToData tbl:%1", table_input["tbl"]:[] );
if( size( table_input["tbl"]:[] )>1 )
{
table_input["tbl"] = sort( term a, term b, table_input["tbl"]:[],
``(a[2]:""http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=60827&r1=60826&r2=60827&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Tue Feb 16 16:32:38 2010
@@ -2045,6 +2045,12 @@
}
+ global boolean IsInstallationSource(string device)
+ {
+ return !isempty(device) && device == part_insts;
+ }
+
+
/* Dev definitions
dev = maindev | subdev
@@ -3694,7 +3700,7 @@
Popup::Message( txt );
}
}
- if( size(part_insts)>0 && p["device"]:""==part_insts )
+ if (IsInstallationSource(p["device"]:""))
{
ret = false;
y2milestone( "CanEdit part_insts:%1 p:%2", part_insts, p );
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org