Author: locilka
Date: Tue Aug 12 12:45:48 2008
New Revision: 49979
URL: http://svn.opensuse.org/viewcvs/yast?rev=49979&view=rev
Log:
Unifying with versions sent to autobuild
Modified:
trunk/installation/control/control.SLD.xml
trunk/installation/control/control.SLES.xml
Modified: trunk/installation/control/control.SLD.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLD.xml?rev=49979&r1=49978&r2=49979&view=diff
==============================================================================
--- trunk/installation/control/control.SLD.xml (original)
+++ trunk/installation/control/control.SLD.xml Tue Aug 12 12:45:48 2008
@@ -43,37 +43,37 @@
- <!-- FATE #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 #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
@@ -214,7 +214,7 @@
<p>
The installation has completed successfully.
Your system is ready for use.
-Click Finish to log in to the system.
+Click <b>Finish</b> to log in to the system.
</p>
<p>
Please visit us at http://www.novell.com/linux/.
Modified: trunk/installation/control/control.SLES.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=49979&r1=49978&r2=49979&view=diff
==============================================================================
--- trunk/installation/control/control.SLES.xml (original)
+++ trunk/installation/control/control.SLES.xml Tue Aug 12 12:45:48 2008
@@ -40,37 +40,37 @@
- <!-- FATE #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 #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
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
