Author: locilka
Date: Thu Jul 24 12:59:02 2008
New Revision: 49385
URL: http://svn.opensuse.org/viewcvs/yast?rev=49385&view=rev
Log:
- SLES and SLED control files adapted to features added in 11.0.
- Added Automatic Configuration support into SLED (FATE #303396).
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
Modified: trunk/installation/control/control.SLD.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLD.xml?rev=49385&r1=49384&r2=49385&view=diff
==============================================================================
--- trunk/installation/control/control.SLD.xml (original)
+++ trunk/installation/control/control.SLD.xml Thu Jul 24 12:59:02 2008
@@ -27,6 +27,14 @@
false
false
+ <!-- bnc #359115 -->
+ false
+ false
+
+ <!-- Offer add-ons in the installation -->
+ true
+ false
+
<!-- FATE #301937, Save /root content from the installation system to the installed system -->
@@ -35,6 +43,69 @@
+ <!-- FATE #303396, Make second stage non-interactive -->
+ true
+ true
+
+ <!-- Configuration for inst_automatic_configuration script -->
+
+ <!--
+ Adding inst_hostname client here, needed to generate random
+ hostname in automatic config (and for 127.0.0.2 hack) (#383336)
+ Must be called before inst_netprobe however, it cannot override it later on
+ -->
+
+ ac_1
+ <icon>yast-sw_single</icon>
+ <type>scripts</type>
+
+ initialization
+ hostname
+ netprobe
+ rpmcopy_secondstage
+
+
+ <!-- network proposal -->
+
+ ac_2
+ <icon>yast-network</icon>
+ <type>proposals</type>
+
+ lan
+ general
+ dsl
+ isdn
+ modem
+ remote
+ firewall
+
+
+ <!-- hardware proposal -->
+
+ ac_3
+ <icon>yast-hwinfo</icon>
+ <type>proposals</type>
+
+ x11
+ printer
+ sound
+ tv
+
+
+ <!-- finishing configuration -->
+
+ ac_4
+ <icon>yast-sysconfig</icon>
+ <type>scripts</type>
+
+ addon_update_sources
+ extrasources
+ suseconfig
+ save_hardware_status
+
+
+
+
<!-- FATE: #304865: Enhance YaST Modules to cooperate better handling the product licenses -->
/etc/YaST2/licenses/base/
@@ -47,26 +118,27 @@
true
<!-- For SLED10, unmaintained (old) packages are not removed by default, FATE #301844, bugzilla #233156 -->
- ^SUSE (LINUX|Linux) Enterprise Desktop 10.*$
+ ^SUSE (LINUX|Linux) Enterprise Desktop 11.*$
<!-- By default, packages can be downgraded -->
true
<!-- For SLED10, packages are not downgraded, FATE #301990, bugzilla #238488 -->
- ^SUSE (LINUX|Linux) Enterprise Desktop 10.*$
+ ^SUSE (LINUX|Linux) Enterprise Desktop 11.*$
<!-- By default, select new packages for installation -->
false
<!-- For SLED10, do not install new packages by default, FATE #301844, bugzilla #233156 -->
- ^SUSE (LINUX|Linux) Enterprise Desktop 10.*$
+ ^SUSE (LINUX|Linux) Enterprise Desktop 11.*$
auto
default-Gnome
</software>
+
<partitioning>
false
true
@@ -80,6 +152,7 @@
25G
false
</partitioning>
+
<network>
false
always
@@ -104,7 +177,7 @@
iscsi-client
<texts>
- <congratulate>
+ <congratulate>
<label>
<p>
The installation has completed successfully.
@@ -115,7 +188,12 @@
Please visit us at http://www.novell.com/linux/.
</p>
</label>
- </congratulate>
+ </congratulate>
+
+ <label>Initialization...</label>
+ <label>Configuring network...</label>
+ <label>Configuring hardware...</label>
+ <label>Finishing configuration...</label>
</texts>
<proposals config:type="list">
@@ -163,6 +241,7 @@
</proposal>
+
<proposal>
<label>Update Settings</label>
<mode>update</mode>
@@ -197,6 +276,7 @@
keyboard
</proposal>
+
<proposal>
<label>Network Configuration</label>
<name>network</name>
@@ -237,6 +317,7 @@
</proposal>
+
<proposal>
<label>Hardware Configuration</label>
<name>hardware</name>
@@ -319,11 +400,15 @@
</module>
-->
<module>
- <heading>yes</heading>
- <label>Installation</label>
+ <label>User Settings</label>
+ <name>user_first</name>
+ </module>
+ <module>
+ <label>User Settings</label>
+ <name>root_first</name>
</module>
<module>
- <label>Installation Summary</label>
+ <label>Installation Overview</label>
<name>proposal</name>
<proposal>initial</proposal>
</module>
@@ -348,9 +433,11 @@
<module>
<label>Perform Installation</label>
<name>finish</name>
+ no
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -442,6 +529,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -460,6 +548,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -500,6 +589,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -540,6 +630,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<stage>continue</stage>
<mode>update</mode>
@@ -612,6 +703,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<stage>continue</stage>
<mode>installation</mode>
@@ -625,6 +717,12 @@
<heading>yes</heading>
<label>Configuration</label>
</module>
+ <module>
+ <label>Automatic Configuration</label>
+ <name>automatic_configuration</name>
+ no
+ no
+ </module>
<module>
<label>root Password</label>
<name>root</name>
@@ -726,6 +824,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<stage>initial</stage>
<label>Base Installation</label>
@@ -775,6 +874,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -810,5 +910,6 @@
</module>
</modules>
</workflow>
+
</workflows>
</productDefines>
Modified: trunk/installation/control/control.SLES.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=49385&r1=49384&r2=49385&view=diff
==============================================================================
--- trunk/installation/control/control.SLES.xml (original)
+++ trunk/installation/control/control.SLES.xml Thu Jul 24 12:59:02 2008
@@ -28,6 +28,10 @@
true
true
+ <!-- Offer add-ons in the installation -->
+ true
+ false
+
<!-- FATE #301937, Save /root content from the installation system to the installed system -->
@@ -36,6 +40,9 @@
+ <!-- FATE #303396, Make second is still interactive -->
+ false
+
<!-- FATE: #304865: Enhance YaST Modules to cooperate better handling the product licenses -->
/etc/YaST2/licenses/base/
@@ -48,14 +55,14 @@
true
<!-- For SLES10, unmaintained (old) packages are not removed by default, FATE #301844, bugzilla #233156 -->
- ^SUSE (LINUX|Linux) Enterprise Server 10.*$
+ ^SUSE (LINUX|Linux) Enterprise Server 11.*$
<!-- By default, packages can be downgraded -->
true
<!-- For SLES10, packages are not downgraded, FATE #301990, bugzilla #238488 -->
- ^SUSE (LINUX|Linux) Enterprise Server 10.*$
+ ^SUSE (LINUX|Linux) Enterprise Server 11.*$
<!-- By default, select new packages for installation -->
@@ -65,14 +72,15 @@
^SUSE (LINUX|Linux) Enterprise Server 10.*$
- <!-- Only upgrading from SLES9 or SLES10 is supported, otherwise warning is displayed -->
+ <!-- Only upgrading from SLES10 or SLES11 is supported, otherwise warning is displayed -->
- ^SUSE (LINUX|Linux) Enterprise Server 9.*$
^SUSE (LINUX|Linux) Enterprise Server 10.*$
+ ^SUSE (LINUX|Linux) Enterprise Server 11.*$
auto
</software>
+
<partitioning>
true
false
@@ -86,11 +94,13 @@
25G
false
</partitioning>
+
<network>
false
never
<startmode>auto</startmode>
</network>
+
language
keyboard
@@ -113,6 +123,7 @@
add-on
iscsi-client
+
<texts>
<congratulate>
<label>
@@ -255,6 +266,7 @@
keyboard
</proposal>
+
<proposal>
<archs>s390</archs>
<label>Installation Settings</label>
@@ -276,6 +288,7 @@
zfcp
</proposal>
+
<proposal>
<label>Network Configuration</label>
<name>network</name>
@@ -316,6 +329,7 @@
</proposal>
+
<proposal>
<archs>s390,ppc64</archs>
<label>Network Configuration</label>
@@ -341,6 +355,7 @@
</proposal>
+
<proposal>
<name>service</name>
<stage>continue,normal</stage>
@@ -349,6 +364,7 @@
ldap-server
</proposal>
+
<proposal>
<archs>ppc64</archs>
<label>Hardware Configuration</label>
@@ -360,6 +376,7 @@
printer
</proposal>
+
<proposal>
<archs>s390</archs>
<label>Hardware Configuration</label>
@@ -370,6 +387,7 @@
printer
</proposal>
+
<proposal>
<label>Hardware Configuration</label>
<name>hardware</name>
@@ -474,6 +492,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -565,6 +584,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -583,6 +603,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -623,6 +644,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -663,6 +685,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<stage>continue</stage>
<mode>update</mode>
@@ -754,6 +777,7 @@
</modules>
</workflow>
+
<workflow>
<stage>continue</stage>
<mode>installation</mode>
@@ -895,6 +919,7 @@
</modules>
</workflow>
+
<workflow>
<stage>initial</stage>
<label>Base Installation</label>
@@ -944,6 +969,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -979,5 +1005,6 @@
</module>
</modules>
</workflow>
+
</workflows>
</productDefines>
Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=49385&r1=49384&r2=49385&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Thu Jul 24 12:59:02 2008
@@ -721,6 +721,7 @@
</module>
</modules>
</workflow>
+
<workflow>
<defaults>
<archs>all</archs>
@@ -1142,5 +1143,6 @@
</module>
</modules>
</workflow>
+
</workflows>
</productDefines>
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=49385&r1=49384&r2=49385&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Thu Jul 24 12:59:02 2008
@@ -3,6 +3,8 @@
- Using button label "License Translations..." in complex welcome
dialog (bnc #400616).
+- SLES and SLED control files adapted to features added in 11.0.
+- Added Automatic Configuration support into SLED (FATE #303396).
-------------------------------------------------------------------
Tue Jul 15 16:59:38 CEST 2008 - aschnell@suse.de
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org