[yast-commit] r39097 - in /trunk/live-installer: ./ src/ src/control/ - YaST Commits

29 Jun 2007

Author: jsrain
Date: Fri Jun 29 14:57:28 2007
New Revision: 39097
URL: http://svn.opensuse.org/viewcvs/yast?rev=39097&view=rev
Log:
some polishing, now works correctly, 2nd stage workflow is still to be
discussed
Modified:
    trunk/live-installer/configure.in.in
    trunk/live-installer/src/control/live-install.xml
    trunk/live-installer/src/inst_live_add_base_repo.ycp
    trunk/live-installer/src/inst_live_doit.ycp
    trunk/live-installer/src/inst_live_sw_select.ycp
    trunk/live-installer/src/live-installer.ycp
    trunk/live-installer/src/live_copy_files_finish.ycp
    trunk/live-installer/src/live_runme_at_boot_finish.ycp
Modified: trunk/live-installer/configure.in.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/configure.in.in?re...
==============================================================================

--- trunk/live-installer/configure.in.in (original)
+++ trunk/live-installer/configure.in.in Fri Jun 29 14:57:28 2007
@@ -7,9 +7,11 @@
 ## some common checks
 @YAST2-CHECKS-COMMON@
 @YAST2-CHECKS-YCP@
+@YAST2-CHECKS-TESTSUITE@
## Nasty hack: xgettext doesn't work for XML files, so let's symlink it
-( cd src/control; ln -sf firstboot.xml firstboot.glade )
+( cd src/control; ln -sf live-install.xml live-install.glade )
+find src/control -name *.glade | LC_ALL=C sort > POTFILES
## and generate the output...
 @YAST2-OUTPUT@
Modified: trunk/live-installer/src/control/live-install.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/control/live-i...
==============================================================================
--- trunk/live-installer/src/control/live-install.xml (original)
+++ trunk/live-installer/src/control/live-install.xml Fri Jun 29 14:57:28 2007
@@ -7,7 +7,7 @@
 textdomain="live-installer"
 -->
-    <textdomain>control</textdomain>
+    <textdomain>live-installer</textdomain>
     <globals>
    <additional_kernel_parameters></additional_kernel_parameters>
         <enable_autologin config:type="boolean">true</enable_autologin>
@@ -114,7 +114,7 @@
     <proposals config:type="list">
         <proposal>
             <label>Live Installation Settings</label>
-            <mode>installation</mode>
+            <mode>live_installation</mode>
             <stage>initial</stage>
             <name>initial</name>
             <enable_skip>no</enable_skip>
@@ -124,6 +124,63 @@
                 <proposal_module>bootloader</proposal_module>
             </proposal_modules>
         </proposal>
+        <proposal>
+            <label>Network Configuration</label>
+            <name>network</name>
+            <stage>continue,normal</stage>
+            <enable_skip>yes</enable_skip>
+            <proposal_modules config:type="list">
+                <proposal_module>
+		    <name>lan</name>
+		    <presentation_order>20</presentation_order>
+		</proposal_module>
+                <proposal_module>
+		    <name>networkmanager</name>
+		    <presentation_order>5</presentation_order>
+		</proposal_module>
+                <proposal_module>
+		    <name>ipv6</name>
+		    <presentation_order>15</presentation_order>
+		</proposal_module>
+		<proposal_module>
+		    <name>dsl</name>
+		    <presentation_order>30</presentation_order>
+		</proposal_module>
+                <proposal_module>
+		    <name>isdn</name>
+		    <presentation_order>40</presentation_order>
+		</proposal_module>
+                <proposal_module>
+		    <name>modem</name>
+		    <presentation_order>50</presentation_order>
+		</proposal_module>
+                <proposal_module>
+		    <name>remote</name>
+		    <presentation_order>60</presentation_order>
+		</proposal_module>
+                <proposal_module>
+		    <name>firewall</name>
+		    <presentation_order>10</presentation_order>
+		</proposal_module>
+                <proposal_module>
+		    <name>proxy</name>
+		    <presentation_order>70</presentation_order>
+		</proposal_module>
+            </proposal_modules>
+        </proposal>
+        <proposal>
+            <label>Hardware Configuration</label>
+            <name>hardware</name>
+            <stage>continue</stage>
+            <enable_skip>yes</enable_skip>
+            <proposal_modules config:type="list">
+                <proposal_module>x11</proposal_module>
+                <proposal_module>printer</proposal_module>
+                <proposal_module>sound</proposal_module>
+                <proposal_module>tv</proposal_module>
+                <proposal_module>bluetooth</proposal_module>
+            </proposal_modules>
+        </proposal>
     </proposals>
<!-- Stage: Initial, Mode: Installation -->
@@ -135,7 +192,7 @@
    	<enable_next>yes</enable_next>
             </defaults>
        <label>Installation</label>
-            <mode>installation</mode>
+            <mode>live_installation</mode>
             <stage>initial</stage>
             <modules config:type="list">
                 <module>
@@ -177,66 +234,95 @@
    	<enable_next>yes</enable_next>
             </defaults>
        <label>Configuration</label>
-            <mode>installation</mode>
+            <mode>live_installation</mode>
             <stage>continue</stage>
             <modules config:type="list">
                 <module>
-	            <label>Perform Installation</label>
-                    <name>inst_netsetup</name>
+	            <label>root Password</label>
+                    <name>inst_root</name>
                 </module>
                 <module>
-	            <label>Perform Installation</label>
-                    <name>inst_netprobe</name>
+	            <label>Hostname</label>
+                    <name>inst_hostname</name>
                 </module>
                 <module>
-	            <label>root Password</label>
-                    <name>inst_root</name>
+	            <label>Network</label>
+                    <name>inst_proposal</name>
+                    <proposal>network</proposal>
+                </module>
+		<module>
+	            <label>Network</label>
+                    <name>inst_fam</name>
+		</module>
+                <module>
+	            <label>Network</label>
+                    <name>inst_ask_net_test</name>
                 </module>
                 <module>
-	            <label>Hostname</label>
-                    <name>hostname</name>
+	            <label>Network</label>
+                    <name>inst_do_net_test</name>
                 </module>
    	<module>
-		    <label>Software Selection</label>
+		    <label>Configure Software Management</label>
    	    <name>inst_live_add_base_repo</name>
    	</module>
    	<module>
-		    <label>Software Selection</label>
+                    <label>Online Update</label>
+                    <name>ask_online_update</name>
+                    <enable_back>yes</enable_back>
+                    <enable_next>yes</enable_next>
+                </module>
+                <module>
+	            <label>Online Update</label>
+                    <name>you</name>
+                </module>
+		<module>
+		    <label>Online Update</label>
+		    <name>restore_settings</name>
+		</module>
+<!-- FIXME use appropriate client once it exists
+		<module>
+		    <label>Software Installation</label>
+		    <name>inst_additional_repos</name>
+		</module>
+-->
+		<module>
+		    <label>Software Installation</label>
    	    <name>inst_live_sw_select</name>
    	</module>
    	<module>
-		    <label>Software Selection</label>
+		    <label>Software Installation</label>
    	    <name>inst_rpmcopy</name>
    	</module>
-<!--
                 <module>
-	            <label>Perform Installation</label>
-                    <name>inst_do_resize</name>
-                    <update config:type="boolean">false</update>
-                    <archs>i386,x86_64,ia64</archs>
+	            <label>Users</label>
+                    <name>auth</name>
+                    <enable_back>no</enable_back>
                 </module>
                 <module>
-	            <label>Perform Installation</label>
-                    <name>inst_prepdisk</name>
+	            <label>Users</label>
+                    <name>user</name>
                 </module>
                 <module>
-	            <label>Perform Installation</label>
-                    <name>inst_kickoff</name>
+	            <label>Clean Up</label>
+                    <name>suseconfig</name>
+                    <enable_back>no</enable_back>
+                    <enable_next>no</enable_next>
                 </module>
                 <module>
-	            <label>Perform Installation</label>
-                    <name>live_doit</name>
-		    <enable_next>no</enable_next>
-		    <enable_back>no</enable_back>
+	            <label>Release Notes</label>
+                    <name>release_notes</name>
                 </module>
                 <module>
-	            <label>Perform Installation</label>
-                    <name>inst_finish</name>
-		    <enable_back>no</enable_back>
+	            <label>Hardware Configuration</label>
+                    <name>proposal</name>
+                    <proposal>hardware</proposal>
                 </module>
--->
+                <module>
+	            <label>Hardware Configuration</label>
+		    <name>save_hardware_status</name>
+		</module>
             </modules>
         </workflow>
-
     </workflows>
 </productDefines>
Modified: trunk/live-installer/src/inst_live_add_base_repo.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_add_...
==============================================================================
--- trunk/live-installer/src/inst_live_add_base_repo.ycp (original)
+++ trunk/live-installer/src/inst_live_add_base_repo.ycp Fri Jun 29 14:57:28 2007
@@ -9,6 +9,12 @@
 import "ProductControl";
 import "ProductFeatures";
 import "PackageCallbacksInit";
+import "GetInstArgs";
+import "Wizard";
+
+/* Called backwards */
+if(GetInstArgs::going_back())
+   return `auto;
PackageCallbacksInit::InitPackageCallbacks ();
@@ -16,11 +22,14 @@
 Pkg::TargetInit ("/", false);
 Pkg::SourceStartCache (true);
+Wizard::SetContents (_("Software Installation"), `VBox (), "",
+    GetInstArgs::enable_back(), GetInstArgs::enable_next());
+
 // add initial source
 string url = ProductFeatures::GetStringFeature ("software", "base_repo_url");
 y2milestone ("Base source URL: %1", url);
 Pkg::SourceCreate (url, "/");
-return nil;
+return `next;
} // client end
Modified: trunk/live-installer/src/inst_live_doit.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_doit...
==============================================================================
--- trunk/live-installer/src/inst_live_doit.ycp (original)
+++ trunk/live-installer/src/inst_live_doit.ycp Fri Jun 29 14:57:28 2007
@@ -7,6 +7,8 @@
 textdomain "live-installer";
import "Installation";
+import "Progress";
+import "Wizard";
Installation::destdir = "/mnt";
@@ -92,7 +94,10 @@
  * @return boolean true on success
  */
 boolean CopySymlinkedImage (map<string,string> symlinks) {
+    integer index = 0;
     foreach (string link, string target, symlinks, {
+	index = index + 1;
+	Progress::Title (sformat (_("Copying %1..."), link));
    SCR::Execute (.target.remove, sformat ("%1/%2", Installation::destdir, link));
 /*
    list<string> components = splitstring (link, "/");
@@ -106,6 +111,7 @@
    link = mergestring (components, "/");
 */
    FileSystemCopy ("/" + target, sformat ("%1/%2", Installation::destdir, link));
+	Progress::Step (10 + (90 * index / size (symlinks)));
     });
     return true;
 }
@@ -122,9 +128,29 @@
     return true;
 }
+Progress::New(
+    // Headline for last dialog of base installation: Install LILO etc.
+    _("Copying the Live Image to Hard Disk"),
+    "",	// Initial progress bar label - not empty (reserve space!)
+    100,
+    [ _("Copy root filesystem"), _("Evaluate additional filesystems"), _("Copy additional filesystems") ],
+    [],
+    "");
+
+Wizard::DisableBackButton ();
+Wizard::DisableNextButton ();
+
+Progress::NextStage ();
+Progress::Title (_("Copying root filesystem..."));
 CopyRootImage ();
+Progress::NextStageStep (5);
+Progress::Title (_("Evaluating additional filesystems..."));
 map<string,string> copy_map = LinksMap (LinksToCopyList ());
+Progress::NextStageStep (10);
 CopySymlinkedImage (copy_map);
+Progress::Finish();
+Progress::Title (_("Finished."));
+return `next;
} // client end
Modified: trunk/live-installer/src/inst_live_sw_select.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_sw_s...
==============================================================================
--- trunk/live-installer/src/inst_live_sw_select.ycp (original)
+++ trunk/live-installer/src/inst_live_sw_select.ycp Fri Jun 29 14:57:28 2007
@@ -6,9 +6,17 @@
 {
 textdomain "live-installer";
+import "GetInstArgs";
+import "Wizard";
+
+/* Called backwards */
+if(GetInstArgs::going_back())
+   return `auto;
+
+Wizard::SetContents (_("Software Installation"), `VBox (), "",
+    GetInstArgs::enable_back(), GetInstArgs::enable_next());
 symbol result = (symbol)WFM::CallFunction ("inst_packages", []);
 y2milestone ("Result: %1", result);
-return nil;
 return result == `accept
     ? `next
     : `back;
Modified: trunk/live-installer/src/live-installer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installer...
==============================================================================
--- trunk/live-installer/src/live-installer.ycp (original)
+++ trunk/live-installer/src/live-installer.ycp Fri Jun 29 14:57:28 2007
@@ -25,9 +25,12 @@
     // FIXME hack because of bootloader - libzypp does not contain product database
     Product::name = "SUSE Linux";
-    list<map> stage_mode = [$["stage": "initial",  "mode": "installation" ]];
+    list<map> stage_mode = [
+	$["stage": "initial",  "mode": "live_installation" ],
+	$["stage": "continue",  "mode": "live_installation" ]
+    ];
     y2internal ("SM: %1", stage_mode);
-    Mode::SetMode ("installation");
+    Mode::SetMode ("live_installation");
     // Stage::initial is required for most of the modules to behave correctly
     Stage::Set ("initial");
     Storage::InitLibstorage ();
Modified: trunk/live-installer/src/live_copy_files_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live_copy_file...
==============================================================================
--- trunk/live-installer/src/live_copy_files_finish.ycp (original)
+++ trunk/live-installer/src/live_copy_files_finish.ycp Fri Jun 29 14:57:28 2007
@@ -14,13 +14,15 @@
{
-textdomain "installation";
+textdomain "live-installer";
import "Installation";
 import "Directory";
 import "ProductControl";
 import "FileUtils";
 import "String";
+import "Initrd";
+import "BootCommon";
 // FIXME don't know why it fails :-(
 // import "SystemFilesCopy";
@@ -79,6 +81,10 @@
     {
    SCR::Execute (.target.bash, sformat("/bin/cp /info.txt %1", eula_txt));
     }
+
+    // FIXME belongs somewhere else
+    Initrd::SetAdditionalParameters (Initrd::AdditionalParameters () + " -d " + BootCommon::RootPartitionDevice);
+
 }
 else
 {
Modified: trunk/live-installer/src/live_runme_at_boot_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live_runme_at_...
==============================================================================
--- trunk/live-installer/src/live_runme_at_boot_finish.ycp (original)
+++ trunk/live-installer/src/live_runme_at_boot_finish.ycp Fri Jun 29 14:57:28 2007
@@ -14,10 +14,11 @@
{
-textdomain "installation";
+textdomain "live-installer";
import "Mode";
 import "Directory";
+import "Misc";
include "installation/misc.ycp";
@@ -57,6 +58,13 @@
     {
         y2error ("Couldn't create target %1", runme_at_boot );
     }
+    if (!SCR::Write (.target.string, Installation::file_live_install_mode, "YES"))
+    {
+        y2error ("Couldn't create target %1", Installation::file_live_install_mode );
+    }
+    // FIXME doesn't belong here
+    Misc::boot_msg = _("Reboot the computer without the Live CD in the drive
+to continue the installation.");
 }
 else
 {
-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    