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