[yast-commit] r50453 - in /branches/tmp/visnov/progress: control.xml installation/inst_prepareprogress.ycp packager/SlideShow.ycp packager/inst_rpmcopy.ycp storage/inst_prepdisk.ycp

Author: visnov Date: Thu Aug 28 14:40:41 2008 New Revision: 50453 URL: http://svn.opensuse.org/viewcvs/yast?rev=50453&view=rev Log: Backup, more progress: - slides actually move - installation client to initialize the progress - adopted control.xml - distribution update fixed - package install global progress fixed Added: branches/tmp/visnov/progress/control.xml branches/tmp/visnov/progress/installation/inst_prepareprogress.ycp Modified: branches/tmp/visnov/progress/packager/SlideShow.ycp branches/tmp/visnov/progress/packager/inst_rpmcopy.ycp branches/tmp/visnov/progress/storage/inst_prepdisk.ycp Added: branches/tmp/visnov/progress/control.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/visnov/progress/control.xml?rev=50453&view=auto ============================================================================== --- branches/tmp/visnov/progress/control.xml (added) +++ branches/tmp/visnov/progress/control.xml Thu Aug 28 14:40:41 2008 @@ -0,0 +1,1208 @@ +<?xml version="1.0"?> +http://www.suse.com/1.0/yast2ns" + xmlns:config="http://www.suse.com/1.0/configns"> + +<!-- +Work around for the text domain +textdomain="control" +--> + + <textdomain>control</textdomain> + + <globals> + + true + true + false + + <!-- FATE #303875, see /etc/sysconfig/network/dhcp:WRITE_HOSTNAME_TO_HOSTS --> + true + + 95 + true + true + simple + false + true + true + true + true + false + true + + <!-- bnc #359115 comment #14 --> + true + false + + <!-- Offer online repositories feature in the installation --> + false + true + + <!-- Offer add-ons in the installation --> + true + false + + <!-- FATE #301937, Save /root content from the installation system to the installed system --> + + + /root/ + /root/inst-sys/ + + + + <!-- 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 + true + + <!-- 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 + <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/ + + <!-- #303798: YaST2 runlevel editor: offer easy enablement and configuration of runlevel 4 --> + false + </globals> + + <software> + true + auto + + <!-- Bugzilla #327791, if not set, default is true --> + false + + <!-- FATE #300898, List of external sources accesible during the installation time --> + http://download.opensuse.org/YaST/Repos/openSUSE_111_Servers.xml + + <!-- Dropped packages, bnc #300540 --> + ant-jai art-sharp asterisk asterisk-alsa asterisk-capi asterisk-spandsp asterisk-zaptel astools avalon-framework avalon-framework-manual avalon-logkit avalon-logkit-javadoc avmailgate bbtools bitchx blackbox colorgcc compat-curl2 cpp41 cpp42 cups-SUSE-ppds-dat db42 dbus-1-gtk devs dockutils dragonegg ejb-javadoc gal2 gcc41 gcc41-32bit gcc41-ada gcc41-c++ gcc41-fortran gcc41-fortran-32bit gcc41-gij gcc41-gij-32bit gcc41-java gcc41-locale gcc41-objc gcc41-obj-c++ gcc41-objc-32bit gcc42 gcc42-32bit gcc42-c++ gcc42-fortran gcc42-fortran-32bit gcc42-gij gcc42-info gcc42-java gcc42-objc gcc42-objc-32bit gconf-sharp gecko-sharp glade-sharp glib-sharp gnome-keyring-manager gnome-sharp gtk-engines gtkglarea gtkhtml-sharp2 gtk-qt-engine gtk-sharp gtk-sharp-complete gtk-sharp-gapi hermes ial indeview ipgrab ipw3945d ircd jaf-demo jaf-javadoc jaf-manual jai java-1_4_2-cacao java-1_4_2-cacao-devel java-1_4_2-sun java-1_4_2-sun-devel java-1_4_2-sun-plugin javamail-manual jms-javadoc jmx jmx-javadoc jta jta-javadoc kbilliards kfs kino knx kssh libcurl2 libexiv2 libgcc41 libgcc41-32bit libgcj41 libgcj41-32bit libgcj41-devel libgcj42 libgcj42-devel libgfortran42 libgfortran42-32bit libgmime-2_0-2 libgpod libgpod2 libipoddevice libkdcraw1 libkexiv2 libMagick10 libmudflap41 libmudflap41-32bit libpri libqtpod libsoprano3 libsoprano3-32bit libstdc++41 libstdc++41-32bit libstdc++41-devel libstdc++42-devel libWand10 libzypp-zmd-backend limal-bootloader openbox perl-Xmms planmaker qjackconnect radiusclient rsaref rsvg-sharp2 rug samba-pdb sax2-libsax-csharp simutrans sqlite-zmd synce synce-kde tei_3 textmaker tomcat5 tomcat55 tomcat55-common-lib tomcat55-jasper tomcat55-jsp-2_0-api tomcat55-server-lib tomcat55-servlet-2_4-api tpb varmon vte-sharp vte-sharp2 websh wlan-kmp-xen xen-doc-ps xmms xmms-jack xmms-lib yast2-bluetooth yast2-bootfloppy yast2-power-management yast2-powertweak zaptel zaptel-kmp-default zen-updater zmd zope + + <!-- Default update repository, bnc #381360 --> + + <baseurl>http://download.opensuse.org/update/11.1/</baseurl> + <name>Updates for 11.1</name> + <alias>openSUSE-11.1-Updates</alias> + / + <enabled config:type="boolean">true</enabled> + <autorefresh config:type="boolean">true</autorefresh> + <priority config:type="integer">20</priority> + + + <!-- Replacement for EXTRAURLS and OPTIONALURLS --> + + <baseurl>http://download.opensuse.org/distribution/11.1/repo/oss/</baseurl> + <name>openSUSE-11.1-Oss</name> + <alias>repo-oss</alias> + / + <enabled config:type="boolean">true</enabled> + <autorefresh config:type="boolean">true</autorefresh> + <priority config:type="integer">100</priority> + + + <baseurl>http://download.opensuse.org/distribution/11.1/repo/non-oss/</baseurl> + <alias>repo-non-oss</alias> + <name>openSUSE-11.1-Non-Oss</name> + / + <enabled config:type="boolean">true</enabled> + <autorefresh config:type="boolean">true</autorefresh> + <priority config:type="integer">100</priority> + + + <baseurl>http://download.opensuse.org/distribution/11.1/repo/debug/</baseurl> + <alias>repo-debug</alias> + <name>openSUSE-11.1-Debug</name> + / + <enabled config:type="boolean">false</enabled> + <autorefresh config:type="boolean">true</autorefresh> + <priority config:type="integer">100</priority> + + + </software> + + <partitioning> + false + true + 7G + 40 + 5G + 20G + false + false + 15G + 25G + false + </partitioning> + + <network> + false + laptop + <startmode>ifplugd</startmode> + </network> + + + language + keyboard + timezone + users + networking + firewall + host + routing + proxy + runlevel + x11 + nis + ldap + printer + add-on + iscsi-client + + + <texts> + <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>Initialization...</label> + <label>Configuring network...</label> + <label>Configuring hardware...</label> + <label>Finishing configuration...</label> + </texts> + + <proposals config:type="list"> + <proposal> + <label>Installation Settings</label> + <mode>installation,demo,autoinstallation</mode> + <stage>initial</stage> + <name>initial</name> + no + + + <name>partitions</name> + 10 + + + <name>bootloader</name> + 20 + + + <name>country_simple</name> + 40 + + + <name>timezone</name> + 50 + + <!-- FATE #302980 --> + + <name>users</name> + 60 + + + <name>hwinfo</name> + 80 + + + <name>mouse</name> + 90 + + <!-- software proposal should be computed almost at the end --> + + <name>software</name> + 30 + + <!-- propose the default runlevel after software is selected, bnc #380141 --> + + <name>runlevel</name> + 70 + + <!-- finds images to deploy --> + + <name>deploying</name> + 95 + + +<!-- + <proposal_tabs config:type="list"> + <proposal_tab> + <label>Overview</label> + <proposal_modules config:type="list"> + <proposal_module>partitions</proposal_module> + <proposal_module>software_simple</proposal_module> + <proposal_module>country_simple</proposal_module> + </proposal_modules> + </proposal_tab> + <proposal_tab> + <label>Expert</label> + <proposal_modules config:type="list"> + <proposal_module>hwinfo</proposal_module> + <proposal_module>keyboard</proposal_module> + <proposal_module>mouse</proposal_module> + <proposal_module>partitions</proposal_module> + <proposal_module>software</proposal_module> + <proposal_module>bootloader</proposal_module> + <proposal_module>timezone</proposal_module> + <proposal_module>language</proposal_module> + <proposal_module>users</proposal_module> + <proposal_module>runlevel</proposal_module> + </proposal_modules> + </proposal_tab> + </proposal_tabs> +--> + </proposal> + + <proposal> + <label>Live Installation Settings</label> + <mode>live_installation</mode> + <stage>initial</stage> + <name>initial</name> + no + + hwinfo + partitions + bootloader + keyboard + timezone + runlevel + + </proposal> + + <proposal> + <label>Update Settings</label> + <mode>update</mode> + <name>initial</name> + <stage>normal</stage> + no + + update + packages + backup + language + + </proposal> + + <proposal> + <label>Installation Settings</label> + <mode>update</mode> + <stage>initial</stage> + <name>initial</name> + no + + hwinfo + media +<!-- disabled due to bug 165832 + <proposal_module>rootpart</proposal_module> +--> + update + packages + backup + language + keyboard + + </proposal> + + <proposal> + <label>Network Configuration</label> + <name>network</name> + <stage>continue,normal</stage> + yes + + + <name>lan</name> + 20 + + + <name>general</name> + 5 + + + <name>dsl</name> + 30 + + + <name>isdn</name> + 40 + + + <name>modem</name> + 50 + + + <name>remote</name> + 60 + + + <name>firewall</name> + 10 + + + <name>proxy</name> + 70 + + + </proposal> + + <proposal> + <label>Hardware Configuration</label> + <name>hardware</name> + <stage>continue</stage> + yes + + x11 + printer + sound + tv + bluetooth + + </proposal> + </proposals> + + <!-- Stage: Initial, Mode: Installation --> + <workflows config:type="list"> + <workflow> + <defaults> + <archs>all</archs> + yes + yes + </defaults> + <label>Preparation</label> + <mode>installation</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>Welcome</label> + <name>complex_welcome</name> + no + yes + <arguments> + yes + </arguments> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>Disk Activation</label> + <name>disks_activate</name> + </module> + <module> + <label>System Analysis</label> + <name>system_analysis</name> + </module> + <module> + <label>System Analysis</label> + <name>mode</name> + </module> + <!-- Here, user selects whether to perform New Installation or Upgrade --> + <module> + <label>Online Repositories</label> + <name>productsources</name> + yes + </module> + <module> + <label>Add-On Products</label> + <name>add-on</name> + yes + </module> + <module> + <label>Time Zone</label> + <name>timezone</name> + <arguments> + yes + </arguments> + yes + </module> + <module> + <label>Desktop Selection</label> + <name>new_desktop</name> + </module> + <module> + <label>Disk</label> + <name>disk_proposal</name> + yes + yes + </module> + <module> + <label>User Settings</label> + <name>user_first</name> + </module> + <module> + <label>User Settings</label> + <name>root_first</name> + </module> + <module> + <heading>yes</heading> + <label>Installation</label> + </module> + <module> + <label>Installation Overview</label> + <name>proposal</name> + <proposal>initial</proposal> + </module> + <module> + <label>Perform Installation (my!)</label> + <name>prepareprogress</name> + </module> + <module> + <label>Perform Installation</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Installation</label> + <name>prepdisk</name> + </module> + <!-- Installation from images --> + <module> + <label>Perform Installation</label> + <name>deploy_image</name> + </module> + <!-- Installation from image --> + <!-- kickoff moved here in order not to replace files it writes + with files from the image --> + <module> + <label>Perform Installation</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Installation</label> + <name>rpmcopy</name> + no + no + </module> + <module> + <label>Perform Installation</label> + <name>finish</name> + no + </module> + </modules> + </workflow> + + <!-- Stage: Initial, Mode: Live Installation --> + <workflow> + <defaults> + <archs>all</archs> + yes + yes + </defaults> + <label>Installation</label> + <mode>live_installation</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>Welcome</label> + <name>complex_welcome</name> + no + yes + <arguments> + yes + </arguments> + <retranslate config:type="boolean">true</retranslate> + </module> +<!-- + <module> + <label>Welcome</label> + <name>inst_live_welcome</name> + </module> + <module> + <label>License Agreement</label> + <name>inst_license</name> + </module> +--> + <module> + <label>Time Zone</label> + <name>timezone</name> + <arguments> + yes + </arguments> + yes + </module> + <module> + <label>Disk</label> + <name>disk_proposal</name> + yes + yes + </module> + <module> + <label>User Settings</label> + <name>user_first</name> + </module> + <module> + <label>User Settings</label> + <name>root_first</name> + </module> +<!-- + <module> + <label>Installation Settings</label> + <name>inst_live_simple_proposal</name> + <proposal>initial</proposal> + </module> + <module> + <label>Installation Settings</label> + <name>inst_live_full_proposal</name> + <proposal>initial</proposal> + </module> +--> + <module> + <label>Installation Settings</label> + <name>inst_live_pre-proposal</name> + </module> + <module> + <label>Installation Settings</label> + <name>inst_proposal</name> + <proposal>initial</proposal> + </module> + <module> + <label>Perform Installation (my!)</label> + <name>inst_prepareprogress</name> + </module> + <module> + <label>Perform Installation</label> + <name>inst_do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Installation</label> + <name>inst_prepdisk</name> + </module> + <module> + <label>Perform Installation</label> + <name>inst_kickoff</name> + </module> + <module> + <label>Perform Installation</label> + <name>inst_live_doit</name> + no + no + </module> + <module> + <label>Perform Installation</label> + <name>inst_finish</name> + no + </module> + </modules> + </workflow> + + <!-- Stage: Initial, Mode: Update --> + <workflow> + <defaults> + <archs>all</archs> + yes + yes + </defaults> + <label>Preparation</label> + <mode>update</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <name>complex_welcome</name> + <label>Welcome</label> + no + <arguments> + yes + </arguments> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>Disk Activation</label> + <name>disks_activate</name> + </module> + <module> + <label>System Analysis</label> + <name>system_analysis</name> + </module> + <module> + <label>System Analysis</label> + <name>mode</name> + </module> + <module> + <label>System for Update</label> + <name>update_partition</name> + </module> + <module> + <name>upgrade_urls</name> + </module> + <module> + <label>Online Repositories</label> + <name>productsources</name> + yes + </module> + <module> + <label>Add-On Products</label> + <name>add-on</name> + yes + </module> + <module> + <heading>yes</heading> + <label>Update</label> + </module> + <module> + <label>Update Settings</label> + <name>proposal</name> + <proposal>initial</proposal> + </module> + <module> + <label>Perform Installation (my!)</label> + <name>inst_prepareprogress</name> + </module> + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + no + no + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + no + </module> + </modules> + </workflow> + + <workflow> + <defaults> + <archs>all</archs> + </defaults> + <stage>initial</stage> + <label>Preparation</label> + <mode>repair</mode> + <modules config:type="list"> + <module> + <label>System Information</label> + <name>info</name> + </module> + <module> + <label>Perform Repair</label> + <name>repair</name> + </module> + </modules> + </workflow> + + <!-- Stage: Initial, Mode: ScreenShot --> + <workflow> + <defaults> + <archs>all</archs> + yes + yes + </defaults> + <stage>initial</stage> + <label>Base Installation</label> + <mode>screen_shot</mode> + <modules config:type="list"> + <module> + no + yes + <label>Welcome</label> + <name>complex_welcome</name> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>Installation Settings</label> + <name>proposal</name> + <proposal>initial</proposal> + </module> + <module> + <label>Perform Installation (my!)</label> + <name>prepareprogress</name> + </module> + <module> + <label>Perform Installation</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Installation</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Installation</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Installation</label> + <name>rpmcopy</name> + no + yes + </module> + </modules> + </workflow> + + <!-- Stage: Initial, Mode: Demo --> + <workflow> + <defaults> + <archs>all</archs> + yes + yes + </defaults> + <stage>initial</stage> + <label>Base Installation</label> + <mode>demo</mode> + <modules config:type="list"> + <module> + no + <label>Welcome</label> + <name>complex_welcome</name> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>Installation Settings</label> + <name>proposal</name> + <proposal>initial</proposal> + </module> + <module> + <label>Perform Installation (my!)</label> + <name>prepareprogress</name> + </module> + <module> + <label>Perform Installation</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Installation</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Installation</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Installation</label> + <name>rpmcopy</name> + no + no + </module> + </modules> + </workflow> + + <!-- Stage: Continue, Mode: Update --> + <!-- + Second stage for update has been disabled by FATE #303396 + <workflow> + <stage>continue</stage> + <mode>update</mode> + <defaults> + <archs>all</archs> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </defaults> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>Network</label> + <name>ask_net_test</name> + <enable_back>no</enable_back> + </module> + <module> + <label>Network</label> + <name>do_net_test</name> + </module> + <module> + <label>Registration</label> + <name>addon_update_sources</name> + </module> + <module> + <label>Registration</label> + <name>suse_register</name> + </module> + <module> + <label>Online Update</label> + <name>ask_online_update</name> + </module> + <module> + <label>Online Update</label> + <name>you</name> + </module> + <module> + <label>Online Update</label> + <name>restore_settings</name> + </module> + <module> + <name>suseconfig</name> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </module> + <module> + <label>Release Notes</label> + <name>release_notes</name> + </module> + <module> + <name>congratulate</name> + </module> + </modules> + </workflow> + --> + + <!-- Stage: Continue, Mode: Installation --> + <workflow> + <stage>continue</stage> + <mode>installation</mode> + <defaults> + yes + yes + <archs>all</archs> + </defaults> + <modules config:type="list"> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <!-- + Automatic configuration: disabled in manual configuration, + FATE #303396 + Non-interactive second stage + --> + <module> + <label>Automatic Configuration</label> + <name>automatic_configuration</name> + no + no + </module> + <module> + <label>root Password</label> + <name>root</name> + no + </module> + <module> + <label>Check Installation</label> + <name>initialization</name> + no + no + </module> + <module> + <label>Check Installation</label> + <name>netprobe</name> + no + no + </module> + <module> + <label>Check Installation</label> + <name>rpmcopy_secondstage</name> + no + no + </module> + <module> + <label>Hostname</label> + <name>hostname</name> + </module> + <module> + <label>Network</label> + <name>proposal</name> + <proposal>network</proposal> + </module> + <module> + <label>Network</label> + <name>ask_net_test</name> + </module> + <module> + <label>Network</label> + <name>do_net_test</name> + </module> + <module> + <label>Registration</label> + <name>addon_update_sources</name> + </module> + <module> + <label>Registration</label> + <name>suse_register</name> + </module> + <module> + <label>Online Update</label> + <name>ask_online_update</name> + </module> + <module> + <label>Online Update</label> + <name>you</name> + </module> + <module> + <label>Online Update</label> + <name>extrasources</name> + </module> + <module> + <label>Online Update</label> + <name>restore_settings</name> + </module> + <module> + <label>Users</label> + <name>auth</name> + </module> + <module> + <label>Users</label> + <name>user</name> + </module> + <module> + <name>suseconfig</name> + no + no + </module> + <module> + <label>Release Notes</label> + <name>release_notes</name> + </module> + <module> + <label>Hardware Configuration</label> + <name>proposal</name> + <proposal>hardware</proposal> + </module> + <module> + <label>Hardware Configuration</label> + <name>save_hardware_status</name> + </module> + <module> + <name>congratulate</name> + </module> + </modules> + </workflow> + + <!-- Stage: Continue, Mode: Live Installation --> + <workflow> + <stage>continue</stage> + <mode>live_installation</mode> + <defaults> + yes + yes + <archs>all</archs> + </defaults> + <modules config:type="list"> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>Automatic Configuration</label> + <name>automatic_configuration</name> + no + no + </module> + <module> + <label>Users</label> + <name>auth</name> + </module> + <module> + <label>Users</label> + <name>user</name> + </module> + <module> + <label>Users</label> + <name>live_cleanup</name> + no + </module> + + </modules> + </workflow> + + <!-- Stage: Initial, Mode: AutoInstallation --> + <workflow> + <stage>initial</stage> + <label>Base Installation</label> + <mode>autoinstallation</mode> + <defaults> + <archs>all</archs> + no + no + </defaults> + <modules config:type="list"> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup</name> + </module> + <module> + <label>AutoYaST Settings</label> + <name>proposal</name> + <proposal>initial</proposal> + no + yes + </module> + <module> + <label>Perform Installation (my!)</label> + <name>prepareprogres</name> + </module> + <module> + <label>Perform Installation</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Installation</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Installation</label> + <name>autoimage</name> + </module> + <module> + <label>Perform Installation</label> + <name>rpmcopy</name> + </module> + <module> + <label>Perform Installation</label> + <name>finish</name> + </module> + </modules> + </workflow> + + <!-- Stage: Continue, Mode: AutoInstallation --> + <workflow> + <defaults> + <archs>all</archs> + no + no + </defaults> + <stage>continue</stage> + <mode>autoinstallation</mode> + <modules config:type="list"> + <module> + <label>Perform Installation</label> + <name>netprobe</name> + </module> + <module> + <label>Perform Installation</label> + <name>autopost</name> + </module> + <module> + <label>Perform Installation</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <name>suseconfig</name> + </module> + </modules> + </workflow> + + </workflows> +</productDefines> Added: branches/tmp/visnov/progress/installation/inst_prepareprogress.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/visnov/progress/installation/inst_prepareprogress.ycp?rev=50453&view=auto ============================================================================== --- branches/tmp/visnov/progress/installation/inst_prepareprogress.ycp (added) +++ branches/tmp/visnov/progress/installation/inst_prepareprogress.ycp Thu Aug 28 14:40:41 2008 @@ -0,0 +1,61 @@ +/** + * Module: inst_prepareprogress.ycp + * + * Authors: Stanislav Visnovsky (visnov@suse.cz) + * + * Purpose: + * Set up the global progress for the installation. + * + * possible return values: `back, `abort `next + */ + +{ + textdomain "installation"; + import "Installation"; + import "Mode"; + import "Packages"; + import "Language"; + import "SlideShow"; + import "ImageInstallation"; + import "StorageClients"; + + y2milestone("BEGIN of inst_prepareprogress.ycp"); + + Packages::SlideShowSetUp (Language::language); + + SlideShow::OpenSlideShowDialog(); + SlideShow::InitPkgData(true); // FIXME: this is odd! + + ImageInstallation::FillUpImagesDetails(); + + list< map > stages = [ + $[ + "name" : "disk", + "description": _("Preparing disks..."), + "value" : Mode::update() ? 0 : 120, // FIXME: 2 minutes + "units" : `sec, + ], + $[ + "name" : "images", + "description": _("Deploying Images..."), + "value" : ImageInstallation::TotalSize() / 1024, // kilobytes + "units" : `kb, + ], + $[ + "name" : "packages", + "description": _("Installing Packages..."), + // here, we do a hack, because until images are deployed, we cannot determine how many + // packages will be really installed additionally + "value" : (SlideShow::total_size_to_install - ImageInstallation::TotalSize()) / 1024 , // kilobytes + "units" : `kb, + ], + ]; + + SlideShow::Setup( stages ); + + symbol ret_val = `auto; + + y2milestone("END of inst_prepareprogress.ycp"); + + return ret_val; +} Modified: branches/tmp/visnov/progress/packager/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/visnov/progress/packager/SlideShow.ycp?rev=50453&r1=50452&r2=50453&view=diff ============================================================================== --- branches/tmp/visnov/progress/packager/SlideShow.ycp (original) +++ branches/tmp/visnov/progress/packager/SlideShow.ycp Thu Aug 28 14:40:41 2008 @@ -149,7 +149,7 @@ **/ boolean ShowingSlide() { - return widgets_created && UI::WidgetExists(`slidesPage ); + return widgets_created && UI::WidgetExists(`slideShowPage ); } /** @@ -236,7 +236,7 @@ global void StageProgress( integer value, string text ) { - y2milestone( "Stage progress: %1", _current_stage["start"]:0 + (value * _current_stage["size"]:1 / 100) ); + y2milestone( "Stage progress: %1\nValue: %2", _current_stage, value ); UpdateGlobalProgress( _current_stage["start"]:0 + (value * _current_stage["size"]:1 / 100), text ); } @@ -1267,7 +1267,7 @@ **/ void UpdateTotalProgress(boolean silent_check) { - StageProgress( ( TotalInstalledSize() >> 10 ) * 10 / ( total_size_to_install >> 10 ), GetProgressLabel() ); + StageProgress( ( TotalInstalledSize() >> 10 ) * 100 / ( total_size_to_install >> 10 ), GetProgressLabel() ); UpdateCurrentCdProgress(silent_check); @@ -1660,7 +1660,7 @@ Wizard::SetContents( // Dialog heading while software packages are being installed - _("Performing Installation"), + _("Perform Installation"), contents, HelpText(), false, false ); // has_back, has_next @@ -1708,6 +1708,15 @@ /** + * Initialize generic data to default values + */ + global void Reset() + { + current_slide_no = 0; + slide_start_time = 0; + } + + /** * Initialize internal pacakge data, such as remaining package sizes and * times. This may not be called before the pkginfo server is up and * running, so this cannot be reliably done from the constructor in all @@ -1731,8 +1740,6 @@ last_cd = false; unit_is_seconds = false; // begin with package sizes bytes_per_second = 1; - current_slide_no = 0; - slide_start_time = 0; list< list > src_list = Pkg::PkgMediaNames(); inst_src_names = maplist( list src, src_list, ``(src[0]:"CD") ); @@ -1762,8 +1769,7 @@ y2milestone( "SlideShow::InitPkgData() done; total_sizes_per_cd_per_src: %1", total_sizes_per_cd_per_src ); y2milestone( "SlideShow::InitPkgData(): pkg: %1", total_pkg_count_per_cd_per_src ); - y2milestone( "InitPkgData calling RebuildDialog" ); - RebuildDialog(true); + // RebuildDialog(true); } @@ -1844,7 +1850,7 @@ if ( ! user_switched_to_details ) // Don't override explicit user request! { SwitchToSlideView(); - LoadSlide(0); + // LoadSlide(0); - do not restart slideshow for next CD } } else @@ -1854,7 +1860,7 @@ else UpdateTotalProgress(false); - current_slide_no = 0; + // current_slide_no = 0; - do not restart slideshow for next CD } } @@ -1946,9 +1952,11 @@ // call SlideShowCallbacks::InstallSlideShowCallbacks() WFM::call("wrapper_slideshow_callbacks", ["InstallSlideShowCallbacks"]); - OpenSlideShowBaseDialog(); + // check for slides first, otherwise dialogs will be built without them CheckForSlides(); + OpenSlideShowBaseDialog(); + if ( HaveSlides() ) LoadSlide(0); else @@ -2015,6 +2023,9 @@ */ global void Setup( list< map > stages ) { + // initiliaze the generic counters + Reset(); + // gather total amount of time need integer total_time = 0; Modified: branches/tmp/visnov/progress/packager/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/visnov/progress/packager/inst_rpmcopy.ycp?rev=50453&r1=50452&r2=50453&view=diff ============================================================================== --- branches/tmp/visnov/progress/packager/inst_rpmcopy.ycp (original) +++ branches/tmp/visnov/progress/packager/inst_rpmcopy.ycp Thu Aug 28 14:40:41 2008 @@ -876,6 +876,8 @@ integer maxnumbercds = cdnumbers["maxnumbercds"]:10; integer current_cd_no = cdnumbers["current_cd_no"]:1; + // re-initialize package information + SlideShow::InitPkgData(true); // we want the table SlideShow::ShowTable(); // move the progress to the packages stage Modified: branches/tmp/visnov/progress/storage/inst_prepdisk.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/visnov/progress/storage/inst_prepdisk.ycp?rev=50453&r1=50452&r2=50453&view=diff ============================================================================== --- branches/tmp/visnov/progress/storage/inst_prepdisk.ycp (original) +++ branches/tmp/visnov/progress/storage/inst_prepdisk.ycp Thu Aug 28 14:40:41 2008 @@ -36,10 +36,7 @@ import "Storage"; import "Hotplug"; import "String"; - import "Packages"; - import "Language"; import "SlideShow"; - import "ImageInstallation"; import "StorageClients"; if (Mode::update ()) @@ -99,37 +96,6 @@ // check for ppc-PReP/CHRP system, they need a special boot partition // todo -> put this in a lib, we need it also in inst_custom_part ... - Packages::SlideShowSetUp (Language::language); - - SlideShow::OpenSlideShowDialog(); - SlideShow::InitPkgData(true); // FIXME: this is odd! - - ImageInstallation::FillUpImagesDetails(); - - list< map > stages = [ - $[ - "name" : "disk", - "description": _("Preparing disks..."), - "value" : 120, // FIXME: 2 minutes - "units" : `sec, - ], - $[ - "name" : "images", - "description": _("Deploying Images..."), - "value" : ImageInstallation::TotalSize() / 1024, // kilobytes - "units" : `kb, - ], - $[ - "name" : "packages", - "description": _("Installing Packages..."), - "value" : SlideShow::total_size_to_install / 1024, // kilobytes - "units" : `kb, - ], - ]; - - SlideShow::Setup( stages ); - - // MakefsDialog(); StorageClients::total_actions = Storage::ActionsCount(); SlideShow::MoveToStage( "disk" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org