Author: fehr
Date: Mon Aug 20 17:01:51 2007
New Revision: 40364
URL: http://svn.opensuse.org/viewcvs/yast?rev=40364&view=rev
Log:
initialize suggested mount points not at module import (#300280)
Modified:
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/include/partition_defines.ycp
trunk/storage/storage/src/modules/FileSystems.ycp
Modified: trunk/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=40364&r1=40363&r2=40364&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Mon Aug 20 17:01:51 2007
@@ -1,8 +1,13 @@
-------------------------------------------------------------------
+Mon Aug 20 17:01:27 CEST 2007 - fehr@suse.de
+
+- initialize suggested mount points not at module import (#300280)
+- version 2.15.21
+
+-------------------------------------------------------------------
Thu Aug 16 18:29:25 CEST 2007 - fehr@suse.de
- fix wrong order of commit actions (#301002)
-- version 2.15.21
-------------------------------------------------------------------
Wed Aug 15 14:13:26 CEST 2007 - aschnell@suse.de
Modified: trunk/storage/storage/src/include/partition_defines.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/partition_defines.ycp?rev=40364&r1=40363&r2=40364&view=diff
==============================================================================
--- trunk/storage/storage/src/include/partition_defines.ycp (original)
+++ trunk/storage/storage/src/include/partition_defines.ycp Mon Aug 20 17:01:51 2007
@@ -136,7 +136,7 @@
``{
if( all_mountpoints == [] || all_mountpoints == nil )
{
- all_mountpoints = (list<string>)FileSystems::suggest_m_points;
+ all_mountpoints = FileSystems::SuggestMPoints();
}
@@ -221,7 +221,7 @@
define string GetMountPointProposal( map targetMap,
list not_supported_mount_points )
``{
- list<string> base = FileSystems::suggest_m_points;
+ list<string> base = FileSystems::SuggestMPoints();
base = filter( string mount_point, base,
``( !contains( not_supported_mount_points, mount_point )));
list free_list = filter( string point, base,
Modified: trunk/storage/storage/src/modules/FileSystems.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=40364&r1=40363&r2=40364&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/FileSystems.ycp (original)
+++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Aug 20 17:01:51 2007
@@ -58,13 +58,25 @@
global list<string> system_m_points = [ "/", "/usr", "/var", "/opt",
Partitions::BootMount() ];
global list<string> crypt_m_points = [ "/", Partitions::BootMount(), "/usr" ];
- global list<string> suggest_m_points = (list<string>)union( system_m_points,
- [ "/home", "/srv", "/tmp", "/local", ""] );
+ list<string> suggest_m_points = [];
global list<string> swap_m_points = [ "swap", "" ];
global list<string> tmp_m_mpoint = [ "/tmp", "/var/tmp" ];
global string nchars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+global list<string> SuggestMPoints()
+ {
+ if( size(suggest_m_points)==0 )
+ {
+ suggest_m_points = [ "/home", "/srv", "/tmp", "/local", ""];
+ if( Stage::initial() )
+ suggest_m_points = (list<string>)union( system_m_points,
+ suggest_m_points );
+ y2milestone( "SuggestMPoints init:%1", suggest_m_points );
+ }
+ return( suggest_m_points );
+ }
+
any lib_id = nil;
define list FstabOptionStrings =
@@ -637,7 +649,7 @@
`fsid_item : "0x83 Linux ",
`fstype : "Linux native" ,
`crypt : true ,
- `mountpoints : suggest_m_points,
+ `mountpoints : SuggestMPoints(),
`mount_option : "-t ext2",
`mount_string : "ext2",
`makefstype : "ext2",
@@ -653,7 +665,7 @@
`fsid_item : "0x0C Win95 FAT32 ",
`fstype : "Fat32",
`crypt : true ,
- `mountpoints : suggest_m_points ,
+ `mountpoints : SuggestMPoints() ,
`mount_option : "-t vfat",
`mount_string : "vfat",
`makefstype : "fat32",
@@ -670,7 +682,7 @@
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native",
`crypt : true,
- `mountpoints : suggest_m_points,
+ `mountpoints : SuggestMPoints(),
`mount_option : "-t reiserfs",
`mount_string : "reiserfs",
`needed_modules : [ "reiserfs" ],
@@ -686,7 +698,7 @@
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native" ,
`crypt : true,
- `mountpoints : suggest_m_points,
+ `mountpoints : SuggestMPoints(),
`mount_option : "-t xfs",
`mount_string : "xfs",
`needed_modules : [ "xfs" ],
@@ -701,7 +713,7 @@
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native" ,
`crypt : true,
- `mountpoints : suggest_m_points,
+ `mountpoints : SuggestMPoints(),
`mount_string : "jfs",
`mount_option : "-t jfs",
`needed_modules : [ "jfs" ],
@@ -716,7 +728,7 @@
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native" ,
`crypt : true,
- `mountpoints : suggest_m_points,
+ `mountpoints : SuggestMPoints(),
`mount_string : "ext3",
`mount_option : "-t ext3",
`needed_modules : [ "jbd", "ext3" ],
@@ -937,11 +949,6 @@
support[`hfsplus] = true;
}
y2milestone( "support %1", support );
- suggest_m_points = [ "/home", "/srv", "/tmp", "/local", ""];
- if( Stage::initial() )
- suggest_m_points = (list<string>)union( system_m_points,
- suggest_m_points );
- y2milestone( "suggest_m_points:%1", suggest_m_points );
}
global define void InitSlib( any sint )
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
