[yast-commit] r49949 - in /trunk/installation: control/ package/ src/clients/ src/modules/ - YaST Commits

11 Aug 2008

Author: locilka
Date: Mon Aug 11 17:39:01 2008
New Revision: 49949

URL: http://svn.opensuse.org/viewcvs/yast?rev=49949&view=rev
Log:
- List of files to be copied from the previous installation moved
  to control file, added new API to define own list (module
  SystemFilesCopy) (FATE #305019).
- Adapted control files.


Modified:
    trunk/installation/control/control.SLD.xml
    trunk/installation/control/control.SLES.xml
    trunk/installation/control/control.openSUSE.xml
    trunk/installation/package/yast2-installation.changes
    trunk/installation/src/clients/inst_pre_install.ycp
    trunk/installation/src/modules/InstData.ycp
    trunk/installation/src/modules/SystemFilesCopy.ycp

Modified: trunk/installation/control/control.SLD.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLD.xml?rev=49949&r1=49948&r2=49949&view=diff
==============================================================================

--- trunk/installation/control/control.SLD.xml (original)
+++ trunk/installation/control/control.SLD.xml Mon Aug 11 17:39:01 2008
@@ -43,6 +43,38 @@
 	    
 	
 
+        <!-- #305019: configure the files to copy from a previous installation -->
+        
+            <!-- FATE #300421: Import ssh keys from previous installations -->
+            
+                /
+                <!-- Files that must be all present on the previous system -->
+                
+                    /etc/ssh/ssh_host_key
+                    /etc/ssh/ssh_host_key.pub
+                
+                <!-- Files thay may be present -->
+                
+                    /etc/ssh/ssh_host_dsa_key
+                    /etc/ssh/ssh_host_dsa_key.pub
+                    /etc/ssh/ssh_host_rsa_key
+                    /etc/ssh/ssh_host_rsa_key.pub
+                
+            
+
+            <!-- FATE #120103: Import Users From Existing Partition -->
+            
+                /var/lib/YaST2/imported/userdata/
+                <!-- Files that must be all present on the previous system -->
+                
+                    /etc/shadow
+                    /etc/passwd
+                    /etc/login.defs
+                    /etc/group
+                
+            
+        
+
 	<!-- FATE #303396, Make second stage non-interactive -->
 	true
 	true

Modified: trunk/installation/control/control.SLES.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=49949&r1=49948&r2=49949&view=diff
==============================================================================
--- trunk/installation/control/control.SLES.xml (original)
+++ trunk/installation/control/control.SLES.xml Mon Aug 11 17:39:01 2008
@@ -40,6 +40,38 @@
 	    
 	
 
+        <!-- #305019: configure the files to copy from a previous installation -->
+        
+            <!-- FATE #300421: Import ssh keys from previous installations -->
+            
+                /
+                <!-- Files that must be all present on the previous system -->
+                
+                    /etc/ssh/ssh_host_key
+                    /etc/ssh/ssh_host_key.pub
+                
+                <!-- Files thay may be present -->
+                
+                    /etc/ssh/ssh_host_dsa_key
+                    /etc/ssh/ssh_host_dsa_key.pub
+                    /etc/ssh/ssh_host_rsa_key
+                    /etc/ssh/ssh_host_rsa_key.pub
+                
+            
+
+            <!-- FATE #120103: Import Users From Existing Partition -->
+            
+                /var/lib/YaST2/imported/userdata/
+                <!-- Files that must be all present on the previous system -->
+                
+                    /etc/shadow
+                    /etc/passwd
+                    /etc/login.defs
+                    /etc/group
+                
+            
+        
+
 	<!-- FATE #303396, Make second is still interactive -->
 	false
 

Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=49949&r1=49948&r2=49949&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Mon Aug 11 17:39:01 2008
@@ -46,6 +46,38 @@
 	    
 	
 
+	<!-- #305019: configure the files to copy from a previous installation -->
+	
+	    <!-- FATE #300421: Import ssh keys from previous installations -->
+	    
+		/
+		<!-- Files that must be all present on the previous system -->
+		
+		    /etc/ssh/ssh_host_key
+		    /etc/ssh/ssh_host_key.pub
+		
+		<!-- Files thay may be present -->
+		
+		    /etc/ssh/ssh_host_dsa_key
+		    /etc/ssh/ssh_host_dsa_key.pub
+		    /etc/ssh/ssh_host_rsa_key
+		    /etc/ssh/ssh_host_rsa_key.pub
+		
+	    
+
+	    <!-- FATE #120103: Import Users From Existing Partition -->
+	    
+		/var/lib/YaST2/imported/userdata/
+		<!-- Files that must be all present on the previous system -->
+		
+		    /etc/shadow
+		    /etc/passwd
+		    /etc/login.defs
+		    /etc/group
+		
+	    
+	
+
 	<!-- FATE #303396, Make second stage non-interactive -->
 	true
 	true

Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=49949&r1=49948&r2=49949&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Mon Aug 11 17:39:01 2008
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Mon Aug 11 17:35:47 CEST 2008 - locilka@suse.cz
+
+- List of files to be copied from the previous installation moved
+  to control file, added new API to define own list (module
+  SystemFilesCopy) (FATE #305019).
+- Adapted control files.
+
+-------------------------------------------------------------------
 Mon Aug 11 10:06:02 CEST 2008 - locilka@suse.cz
 
 - Fixed WFM::Execute to use .local instead of .target 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=49949&r1=49948&r2=49949&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_pre_install.ycp (original)
+++ trunk/installation/src/clients/inst_pre_install.ycp Mon Aug 11 17:39:01 2008
@@ -3,6 +3,9 @@
     import "FileUtils";
     import "Directory";
     import "SystemFilesCopy";
+    import "ProductFeatures";
+    import "ProductControl";
+    import "InstData";
 
     // --> Functions
 
@@ -17,34 +20,46 @@
     // all partitions that can be used as a 
     list  > useful_partitions = [];
 
-    list <symbol> possible_root_fs = [ `ext2, `ext3, `reiser, `xfs, `jfs ];
+    list <symbol> possible_root_fs = [ `ext2, `ext3, `ext4, `reiser, `xfs, `jfs ];
 
     /* ******************************************************************************* */
     // --> main()
 
     Initialize();
 
-    // FATE #300421: Import ssh keys from previous installations
-    FindAndCopyNewestFiles (
-	"/",
-	// required
-	["/etc/ssh/ssh_host_key", "/etc/ssh/ssh_host_key.pub"],
-	// optional
-	["/etc/ssh/ssh_host_dsa_key", "/etc/ssh/ssh_host_dsa_key.pub", "/etc/ssh/ssh_host_rsa_key", "/etc/ssh/ssh_host_rsa_key.pub"]
-    );
-    
-    // FATE #120103: Import Users From Existing Partition
-    FindAndCopyNewestFiles (
-	sformat ("%1/imported/userdata", Directory::vardir),
-	["/etc/shadow", "/etc/passwd", "/etc/login.defs", "/etc/group"],
-	[]
-    );
+    if (InstData::copy_files_use_control_file == true) {
+	y2milestone ("Using copy_to_system from control file");
+
+	// FATE #305019: configure the files to copy from a previous installation
+	// -> configuration moved to control file
+	list <map> copy_items = (list <map>) ProductFeatures::GetFeature ("globals", "copy_to_system");
+
+	foreach (map one_copy_item, copy_items, {
+	    string copy_to_dir = tostring (one_copy_item["copy_to_dir"]:Directory::vardir);
+	    list <string> mandatory_files = (list <string>) one_copy_item["mandatory_files"]:[];
+	    list <string> optional_files = (list <string>) one_copy_item["optional_files"]:[];
+
+	    FindAndCopyNewestFiles (copy_to_dir, mandatory_files, optional_files);
+	});
+    }
+
+    if (SystemFilesCopy::GetUseControlFileDef()) {
+	y2milestone ("Using additional copy_to_system");
+
+	foreach (map one_copy_item, SystemFilesCopy::GetCopySystemFiles(), {
+	    string copy_to_dir = tostring (one_copy_item["copy_to_dir"]:Directory::vardir);
+	    list <string> mandatory_files = (list <string>) one_copy_item["mandatory_files"]:[];
+	    list <string> optional_files = (list <string>) one_copy_item["optional_files"]:[];
+
+	    FindAndCopyNewestFiles (copy_to_dir, mandatory_files, optional_files);
+	});
+    }
 
     // free the memory
     useful_partitions = nil;
     
     // at least some return
-    return `a_glass_of_milk_please;
+    return `auto;
 
     // <-- main()
     /* ******************************************************************************* */
@@ -113,8 +128,8 @@
 
 	    if (am_exit != 0) {
 		y2warning ("%1 is already mounted, trying to umount...", mnt_tmpdir);
-		integer umount = (integer) SCR::Execute (.target.umount, mnt_tmpdir);
-		if (umount != 0) {
+		boolean umount = (boolean) SCR::Execute (.target.umount, mnt_tmpdir);
+		if (umount != true) {
 		    y2error ("Cannot umount %1", mnt_tmpdir);
 		}
 	    }

Modified: trunk/installation/src/modules/InstData.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstData.ycp?rev=49949&r1=49948&r2=49949&view=diff
==============================================================================
--- trunk/installation/src/modules/InstData.ycp (original)
+++ trunk/installation/src/modules/InstData.ycp Mon Aug 11 17:39:01 2008
@@ -58,5 +58,14 @@
 
     // <-- other
 
+    // --> copy files -- config
+    // FATE #305019: configure the files to copy from a previous installation
+
+    global boolean copy_files_use_control_file = true;
+
+    global list <map> additional_copy_files = [];
+
+    // <-- copy files -- config
+
 /* EOF */
 }

Modified: trunk/installation/src/modules/SystemFilesCopy.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/SystemFilesCopy.ycp?rev=49949&r1=49948&r2=49949&view=diff
==============================================================================
--- trunk/installation/src/modules/SystemFilesCopy.ycp (original)
+++ trunk/installation/src/modules/SystemFilesCopy.ycp Mon Aug 11 17:39:01 2008
@@ -21,7 +21,7 @@
     import "Installation";
     import "ProductFeatures";
     import "Stage";
-
+    import "InstData";
 
 
     // --> Variables
@@ -158,7 +158,7 @@
 	    // 'ignore failed read' is for optional files
 	    // but needs to be entered after the archive name
 	    // bugzilla #326055
-	    "cd '%1'; tar -zcvf '%2' --ignore-failed-read %3",
+	    "cd '%1'; tar --recursion -zcvf '%2' --ignore-failed-read %3",
 	    tmp_mount_directory, String::Quote(archive_name), archive_files
 	);
 	map cmd_run = (map) SCR::Execute(.target.bash_output, command);
@@ -342,5 +342,93 @@
 	return true;
     }
 
+    // FATE #305019: configure the files to copy from a previous installation
+    // -->
+
+    /**
+     * Sets whether copy_files from control file should be used
+     *
+     * @returns boolean whether to use them
+     * @see SetUseControlFileDef
+     */
+    global boolean GetUseControlFileDef () {
+	return (InstData::copy_files_use_control_file == true);
+    }
+
+    /**
+     * Sets whether to use copy_files from control file
+     *
+     * @param boolean whether to use them
+     * @see GetUseControlFileDef
+     */
+    global void SetUseControlFileDef (boolean new_value) {
+	if (new_value == nil) {
+	    y2error ("Wrong value: %1", new_value);
+	    return;
+	}
+
+	InstData::copy_files_use_control_file = new_value;
+	y2milestone ("Using copy_to_system from control file set to: %1", new_value);
+    }
+
+    /**
+     * Returns list of copy_files definitions
+     * @see SetCopySystemFiles for more info
+     */
+    global list <map> GetCopySystemFiles () {
+	return InstData::additional_copy_files;
+    }
+
+    /**
+     * Sets new rules which files will be copied during installation.
+     *
+     * @see FATE #305019: configure the files to copy from a previous installation
+     * @param list <map> of new definitions
+     *
+     * @struct
+     *    [
+     *        "copy_to_dir" : (string) "system_directory_to_copy_to",
+     *        "mandatory_files" : (list <string>) [ list of mandatory files ],
+     *        "optional_files" : (list <string>) [ list of optional files ],
+     *    ]
+     *
+     * @example
+     *    SetCopySystemFiles ([
+     *        $["copy_to_dir":"/root/backup", "mandatory_files":["/etc/passwd", "/etc/shadow"]]
+     *        $["copy_to_dir":"/root/backup", "mandatory_files":["/etc/ssh/ssh_host_dsa_key"], "optional_files":["/etc/ssh/ssh_host_rsa_key.pub"]]
+     *    ])
+     */
+    global void SetCopySystemFiles (list <map> new_copy_files) {
+	InstData::additional_copy_files = [];
+
+	boolean use_item = true;
+
+	foreach (map one_copy_item, new_copy_files, {
+	    string copy_to_dir = tostring (one_copy_item["copy_to_dir"]:Directory::vardir);
+	    if (copy_to_dir == nil || copy_to_dir == "") {
+		y2error ("(string) 'copy_to_dir' must be defined");
+		use_item = false;
+	    }
+
+	    list <string> mandatory_files = (list <string>) one_copy_item["mandatory_files"]:[];
+	    if (mandatory_files == nil || mandatory_files == []) {
+		y2error ("(list <string>) 'mandatory_files' must be defined");
+		use_item = false;
+	    }
+
+	    list <string> optional_files = (list <string>) one_copy_item["optional_files"]:[];
+	    if (optional_files == nil) {
+		y2error ("(list <string>) 'optional_files' wrong definition");
+		use_item = false;
+	    }
+
+	    if (use_item) {
+		InstData::additional_copy_files = add (InstData::additional_copy_files, one_copy_item);
+	    }
+	});
+    }
+
+    // <--
+
 /* EOF */
 }

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

    

[yast-commit] r49949 - in /trunk/installation: control/ package/ src/clients/ src/modules/

locilka＠svn.opensuse.org

tags

participants (1)