[yast-commit] r61748 - in /trunk: installation/ installation/src/clients/ storage/ storage/package/ storage/storage/src/include/ storage/storage/src/modules/ update/ update/src/modules/ - YaST Commits

19 Apr 2010

Author: aschnell
Date: Mon Apr 19 12:27:58 2010
New Revision: 61748

URL: http://svn.opensuse.org/viewcvs/yast?rev=61748&view=rev
Log:
- single definition of possible_root_fs

Modified:
    trunk/installation/src/clients/inst_pre_install.ycp
    trunk/installation/yast2-installation.spec.in
    trunk/storage/VERSION
    trunk/storage/package/yast2-storage.changes
    trunk/storage/storage/src/include/ep-import.ycp
    trunk/storage/storage/src/modules/FileSystems.ycp
    trunk/update/src/modules/RootPart.ycp
    trunk/update/yast2-update.spec.in

Modified: trunk/installation/src/clients/inst_pre_install.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pre_install.ycp?rev=61748&r1=61747&r2=61748&view=diff
==============================================================================

--- trunk/installation/src/clients/inst_pre_install.ycp (original)
+++ trunk/installation/src/clients/inst_pre_install.ycp Mon Apr 19 12:27:58 2010
@@ -1,5 +1,6 @@
 {
     import "Storage";
+    import "FileSystems";
     import "FileUtils";
     import "Directory";
     import "SystemFilesCopy";
@@ -21,7 +22,6 @@
     // all partitions that can be used as a 
     list  > useful_partitions = [];
 
-    list <symbol> possible_root_fs = [ `ext2, `ext3, `ext4, `reiser, `xfs, `jfs ];
 
     /* ******************************************************************************* */
     // --> main()
@@ -247,7 +247,7 @@
 		    return;
 		}
 
-		if (! contains(possible_root_fs, filesystem)) {
+		if (!contains(FileSystems::possible_root_fs, filesystem)) {
 		    y2milestone("Skipping partition %1, %2 is not a root filesystem", devicename, filesystem);
 		    return;
 		}

Modified: trunk/installation/yast2-installation.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=61748&r1=61747&r2=61748&view=diff
==============================================================================
--- trunk/installation/yast2-installation.spec.in (original)
+++ trunk/installation/yast2-installation.spec.in Mon Apr 19 12:27:58 2010
@@ -6,6 +6,9 @@
 License: GPL v2 or later
 BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
 
+# FileSystems::possible_root_fs
+BuildRequires:	yast2-storage >= 2.19.12
+
 # xmllint
 BuildRequires:	libxml2
 
@@ -40,8 +43,8 @@
 # New API for ProductLicense
 Requires:	yast2-packager >= 2.19.2
 
-# Storage::GetCommitInfos() call in include/misc.ycp
-Requires:	yast2-storage >= 2.18.0
+# FileSystems::possible_root_fs
+Requires:	yast2-storage >= 2.19.12
 
 # use in startup scripts
 Requires:	initviocons

Modified: trunk/storage/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=61748&r1=61747&r2=61748&view=diff
==============================================================================
--- trunk/storage/VERSION (original)
+++ trunk/storage/VERSION Mon Apr 19 12:27:58 2010
@@ -1 +1 @@
-2.19.11
+2.19.12

Modified: trunk/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=61748&r1=61747&r2=61748&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Mon Apr 19 12:27:58 2010
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Apr 19 12:17:36 CEST 2010 - aschnell@suse.de
+
+- added list of possible root filesystems to FileSystems module
+- 2.19.12
+
+-------------------------------------------------------------------
 Thu Apr 15 12:04:37 CEST 2010 - aschnell@suse.de
 
 - improved layout of dialog for importing mount points

Modified: trunk/storage/storage/src/include/ep-import.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-import.ycp?rev=61748&r1=61747&r2=61748&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-import.ycp (original)
+++ trunk/storage/storage/src/include/ep-import.ycp Mon Apr 19 12:27:58 2010
@@ -76,12 +76,10 @@
     {
 	map fstabs = $[];
 
-    list<symbol> skip_fs = [ `none, `unknown, `swap, `vfat, `ntfs ];
-
     foreach( string disk_device, map disk, target_map, {
 
 	list<map> partitions = filter(map part, disk["partitions"]:[], {
-	    return !contains(skip_fs, part["detected_fs"]:`unknown);
+	    return contains(FileSystems::possible_root_fs, part["detected_fs"]:`unknown);
 	});
 
 	foreach(map part, partitions, {

Modified: trunk/storage/storage/src/modules/FileSystems.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=61748&r1=61747&r2=61748&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/FileSystems.ycp (original)
+++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Apr 19 12:27:58 2010
@@ -59,6 +59,10 @@
     }
 
 
+    // filesystems possible for root volume. used during scan for root volumes.
+    global const list<symbol> possible_root_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ];
+
+
     global const list<string> system_m_points = [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ];
     global const list<string> crypt_m_points = [ "/", Partitions::BootMount(), "/usr" ];
     global const list<string> swap_m_points = [ "swap" ];

Modified: trunk/update/src/modules/RootPart.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?rev=61748&r1=61747&r2=61748&view=diff
==============================================================================
--- trunk/update/src/modules/RootPart.ycp (original)
+++ trunk/update/src/modules/RootPart.ycp Mon Apr 19 12:27:58 2010
@@ -33,8 +33,6 @@
 
     include "partitioning/custom_part_dialogs.ycp";
 
-    // all supported filesystems
-    global list possible_root_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ];
 
     // Selected root partition for the update or boot.
     global string selectedRootPartition = "";
@@ -119,7 +117,7 @@
 		return i[what]:"";
 
 	    // Linux partition, but no root FS found
-	    } else if (contains (possible_root_fs, i[`fs]:`nil)) {
+	    } else if (contains(FileSystems::possible_root_fs, i[`fs]:`nil)) {
 		// label - name of sustem to update
 		return _("Unknown Linux System");
 
@@ -1519,7 +1517,7 @@
 	symbol p_detect_fs = partition["detected_fs"]:`unknown;
 
 	// possible root FS
-	if ( contains (possible_root_fs, p_detect_fs))
+	if (contains(FileSystems::possible_root_fs, p_detect_fs))
 	{
 	    map mt_map = $[
 		`ext2: "ext2",

Modified: trunk/update/yast2-update.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=61748&r1=61747&r2=61748&view=diff
==============================================================================
--- trunk/update/yast2-update.spec.in (original)
+++ trunk/update/yast2-update.spec.in Mon Apr 19 12:27:58 2010
@@ -3,7 +3,9 @@
 @HEADER@
 Group:	System/YaST
 License: GPL v2 or later
-BuildRequires:	yast2-storage perl-XML-Writer yast2-devtools yast2-testsuite update-desktop-files
+BuildRequires:	perl-XML-Writer yast2-devtools yast2-testsuite update-desktop-files
+# FileSystems::possible_root_fs
+BuildRequires:	yast2-storage >= 2.19.12
 # Packages::GetBaseSourceID
 BuildRequires:	yast2-packager >= 2.17.19
 # Wizard::OpenOKDialog
@@ -16,6 +18,8 @@
 # control.rng
 BuildRequires:	yast2-installation >= 2.17.44
 
+# FileSystems::possible_root_fs
+Requires:	yast2-storage >= 2.19.12
 # PackagesUI::RunPackageSelector
 Requires:	yast2 >= 2.17.40
 Requires:	yast2-installation

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r61748 - in /trunk: installation/ installation/src/clients/ storage/ storage/package/ storage/storage/src/include/ storage/storage/src/modules/ update/ update/src/modules/

aschnell＠svn.opensuse.org

tags

participants (1)