Author: locilka
Date: Thu Jul 10 17:51:00 2008
New Revision: 48977
URL: http://svn.opensuse.org/viewcvs/yast?rev=48977&view=rev
Log:
- Settings for Automatic Configuration moved to control file
because of code reuse for different AC in first boot
(FATE #303939).
Modified:
trunk/installation/control/control.openSUSE.xml
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/inst_automatic_configuration.ycp
Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=48977&r1=48976&r2=48977&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Thu Jul 10 17:51:00 2008
@@ -51,6 +51,61 @@
<!-- FATE #303395, Kexec instead of reboot (default 'false') -->
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
+ <type>scripts</type>
+
+ initialization
+ hostname
+ netprobe
+ rpmcopy_secondstage
+
+
+ <!-- network proposal -->
+
+ ac_2
+ <type>proposals</type>
+
+ lan
+ general
+ dsl
+ isdn
+ modem
+ remote
+ firewall
+
+
+ <!-- hardware proposal -->
+
+ ac_3
+ <type>proposals</type>
+
+ x11
+ printer
+ sound
+ tv
+
+
+ <!-- finishing configuration -->
+
+ ac_4
+ <type>scripts</type>
+
+ addon_update_sources
+ inst_extrasources
+ suseconfig
+ save_hardware_status
+
+
+
</globals>
<software>
@@ -148,15 +203,20 @@
<texts>
- <congratulate>
- <label>
+ <congratulate>
+ <label>
<p><b>Congratulations!</b></p>
<p>The installation of openSUSE on your machine is complete.
After clicking <b>Finish</b>, you can log in to the system.</p>
<p>Visit us at %1.</p>
<p>Have a lot of fun!<br>Your openSUSE Development Team</p>
- </label>
- </congratulate>
+ </label>
+ </congratulate>
+
+ <label>Initialization...</label>
+ <label>Configuring network...</label>
+ <label>Configuring hardware...</label>
+ <label>Finishing configuration...</label>
</texts>
<proposals config:type="list">
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=48977&r1=48976&r2=48977&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Thu Jul 10 17:51:00 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jul 10 17:48:59 CEST 2008 - locilka@suse.cz
+
+- Settings for Automatic Configuration moved to control file
+ because of code reuse for different AC in first boot
+ (FATE #303939).
+
+-------------------------------------------------------------------
Thu Jul 10 13:31:00 CEST 2008 - locilka@suse.cz
- Only directories in release-notes directory are considered to be
Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_automatic_configuration.ycp?rev=48977&r1=48976&r2=48977&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_automatic_configuration.ycp (original)
+++ trunk/installation/src/clients/inst_automatic_configuration.ycp Thu Jul 10 17:51:00 2008
@@ -17,6 +17,8 @@
import "GetInstArgs";
import "Wizard";
import "Progress";
+ import "ProductFeatures";
+ import "ProductControl";
textdomain "installation";
@@ -40,41 +42,44 @@
y2milestone ("automatic_configuration started");
-// TODO: read this from control file
-// (at least the list of modules in proposals)
- list
