[yast-commit] r56499 - in /trunk/update: VERSION package/yast2-update.changes src/modules/RootPart.ycp - YaST Commits

31 Mar 2009

Author: locilka
Date: Tue Mar 31 15:19:23 2009
New Revision: 56499

URL: http://svn.opensuse.org/viewcvs/yast?rev=56499&view=rev
Log:
- Cleanup in RootPart module.
- 2.18.3


Modified:
    trunk/update/VERSION
    trunk/update/package/yast2-update.changes
    trunk/update/src/modules/RootPart.ycp

Modified: trunk/update/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=56499&r1=56498&r2=56499&view=diff
==============================================================================

--- trunk/update/VERSION (original)
+++ trunk/update/VERSION Tue Mar 31 15:19:23 2009
@@ -1 +1 @@
-2.18.2
+2.18.3

Modified: trunk/update/package/yast2-update.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.changes?rev=56499&r1=56498&r2=56499&view=diff
==============================================================================
--- trunk/update/package/yast2-update.changes (original)
+++ trunk/update/package/yast2-update.changes Tue Mar 31 15:19:23 2009
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Mar 31 15:18:39 CEST 2009 - locilka@suse.cz
+
+- Cleanup in RootPart module.
+- 2.18.3
+
+-------------------------------------------------------------------
 Thu Feb 19 17:27:25 CET 2009 - aschnell@suse.de
 
 - added missing import statement

Modified: trunk/update/src/modules/RootPart.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?rev=56499&r1=56498&r2=56499&view=diff
==============================================================================
--- trunk/update/src/modules/RootPart.ycp (original)
+++ trunk/update/src/modules/RootPart.ycp Tue Mar 31 15:19:23 2009
@@ -84,6 +84,15 @@
      */
     list  > activated = [];
 
+    /**
+     * Returns currently activated partitions.
+     *
+     * @return list  > activated
+     */
+    global list  > GetActivated () {
+	return activated;
+    }
+
     global boolean Mounted () {
 	return size (activated) > 0;
     }
@@ -550,33 +559,6 @@
 	    return true;
 	}
 
-/*
- * No more EVMS
-	// bugzilla #237139
-	// '/dev/evms/lvm2/system/root' is the same as '/dev/system/root'
-	// the root from /etc/fstab must be used
-	if (regexpmatch (root["spec"]:"", "/dev/evms/lvm2/") || regexpmatch (partition, "/dev/evms/lvm2/")) {
-	    y2milestone ("Special case with EVMS: %1 vs. %2", root["spec"]:"", partition);
-
-	    string tmp_rootspec  = root["spec"]:"";
-	    string tmp_partition = partition;
-
-	    // they might be the same but this case covers it as well
-	    if (regexpmatch (root["spec"]:"", "/dev/evms/lvm2/"))
-		tmp_rootspec = regexpsub (root["spec"]:"", "/dev/evms/lvm2/(.*)$", "/dev/\\1");
-	    if (regexpmatch (partition, "/dev/evms/lvm2/"))
-		tmp_partition = regexpsub (partition, "/dev/evms/lvm2/(.*)$", "/dev/\\1");
-
-	    y2milestone ("Checking '%1' vs. '%2'", tmp_rootspec, tmp_partition);
-
-	    if (tmp_rootspec == tmp_partition) {
-		found_partition = root["spec"]:"";
-		y2milestone ("EVMS case matching, using %1", found_partition);
-		return true;
-	    }
-	}
-*/
-
 	return true;
     }
 
@@ -782,7 +764,12 @@
 
 
     /**
+     * Reads FSTab and CryptoTab and fills fstab and crtab got as parameters.
+     * Uses Installation::destdir as the base mount point.
      *
+     * @param list <map> ('pointer' to) fstab
+     * @param list <map> ('pointer' to) crtab
+     * @param string root device
      */
     define boolean read_fstab_and_cryptotab (list <map>& fstab, list <map>& crtab, string root_device_current)
     {
@@ -801,8 +788,6 @@
 	    crtab = (list<map>) SCR::Read (.etc.cryptotab);
 	}
 
-	Update::GetProductName();
-
 	boolean fstab_has_separate_var = FstabHasSeparateVar (fstab);
 	// mount /var
 	if (fstab_has_separate_var) {
@@ -1387,6 +1372,7 @@
 	    }
 
 	    read_fstab_and_cryptotab (fstab, crtab, root_device_current);
+	    Update::GetProductName();
 
 	    if (FstabUsesKernelDeviceNameForHarddisks(fstab))
 	    {
@@ -1469,54 +1455,6 @@
 	return success;
     }
 
-
-    global define boolean SetFormatPartitions (list<map> fstabpart)
-    {
-	// All storage devices
-        map  target_map = Storage::GetTargetMap ();
-	list<map> fstab = [];
-	readFsTab(fstab);
-	// all activated
-	list <map> tmp = filter (map e, activated, {
-	    return (e[`type]:"" == "mount" || e[`type]:"" == "swap");
-	});
-
-	foreach (map e, tmp, {
-	    string mntpt = (e[`type]:"" == "swap")?("swap"):(e[`mntpt]:"");
-	    string part  = e[`device]:"";
-
-	    map p = $[];
-	    foreach (map pp, fstabpart, {
-		// mountpoint matches
-		if (pp["mount"]:"" == mntpt) {
-		    p = pp;
-		    break;
-		}
-	    });
-	    string mount_options = "";
-	    foreach (map entry, fstab, {
-		if( entry["file"]:"" == mntpt ) {
-			mount_options = entry["mntops"]:"";
-			break;
-		}
-	    });
-	    target_map = Storage::SetPartitionData (target_map, part, "mount", mntpt );
-	    target_map = Storage::SetPartitionData (target_map, part, "format", p["format"]:false );
-	    target_map = Storage::SetPartitionData (target_map, part, "delete", false);
-	    target_map = Storage::SetPartitionData (target_map, part, "create", false);
-	    if( size(mount_options) > 0 && !haskey(p, "fstopt" ) )
-		    target_map = Storage::SetPartitionData (target_map, part, "fstopt", mount_options);
-	    if( haskey(p, "fstopt" ) )
-		    target_map = Storage::SetPartitionData (target_map, part, "fstopt", p["fstopt"]:"");
-            if( haskey( p, "mountby" ) )
-                target_map = Storage::SetPartitionData (target_map, part, "mountby", p["mountby"]:`device);
-	});
-
-        Storage::SetTargetMap (target_map);
-        return true;
-    }
-
-
     /**
      * Get architecture of an elf file.
      */
@@ -1607,6 +1545,7 @@
 		    list <map> crtab = [];
 		    
 		    read_fstab_and_cryptotab (fstab, crtab, p_dev);
+		    Update::GetProductName();
 
 		    fstab = filter (map p, fstab, ``(p["file"]:""=="/"));
 
@@ -1815,26 +1754,4 @@
     }
 }
 
-global void Propose (boolean force_reset) {
-    y2milestone ("Proposing root partition");
-    Detect ();
-    if (force_reset)
-    {
-        selectedRootPartition = "";
-    }
-
-    if (numberOfValidRootPartitions == 0
-        && selectedRootPartition == "")
-    {
-        targetOk = false;
-    }
-    else
-    {
-        if (selectedRootPartition == "")
-        {
-            SetSelectedToValid ();
-        }
-    }
-}
-
 }

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

    

[yast-commit] r56499 - in /trunk/update: VERSION package/yast2-update.changes src/modules/RootPart.ycp

locilka＠svn.opensuse.org

tags

participants (1)