[yast-commit] r45831 - in /trunk/installation: control/ package/ src/clients/ src/include/ src/modules/ - YaST Commits

28 Mar 2008

Author: locilka
Date: Fri Mar 28 13:37:20 2008
New Revision: 45831

URL: http://svn.opensuse.org/viewcvs/yast?rev=45831&view=rev
Log:
- Automatic configuration has been moved from the end of the first
  stage to the second stage. It's non-interactive (FATE #303396).
- Fixed installation from images (FATE #303554).
- 2.16.27


Modified:
    trunk/installation/control/control.openSUSE.xml
    trunk/installation/package/yast2-installation.changes
    trunk/installation/src/clients/automatic_configuration_finish.ycp
    trunk/installation/src/clients/inst_automatic_configuration.ycp
    trunk/installation/src/clients/inst_deploy_image.ycp
    trunk/installation/src/clients/inst_finish.ycp
    trunk/installation/src/clients/inst_prepare_image.ycp
    trunk/installation/src/clients/inst_software_selection.ycp
    trunk/installation/src/include/inst_inc_first.ycp
    trunk/installation/src/include/misc.ycp
    trunk/installation/src/modules/ImageInstallation.ycp

Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=45831&r1=45830&r2=45831&view=diff
==============================================================================

--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Fri Mar 28 13:37:20 2008
@@ -634,6 +634,17 @@
 		    <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>

Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45831&r1=45830&r2=45831&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Fri Mar 28 13:37:20 2008
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Fri Mar 28 13:33:31 CET 2008 - locilka@suse.cz
+
+- Automatic configuration has been moved from the end of the first
+  stage to the second stage. It's non-interactive (FATE #303396).
+- Fixed installation from images (FATE #303554).
+- 2.16.27
+
+-------------------------------------------------------------------
 Thu Mar 27 13:37:02 CET 2008 - locilka@suse.cz
 
 - Fixed ZMD service handling, the correct name is novell-zmd

Modified: trunk/installation/src/clients/automatic_configuration_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/automatic_configuration_finish.ycp?rev=45831&r1=45830&r2=45831&view=diff
==============================================================================
--- trunk/installation/src/clients/automatic_configuration_finish.ycp (original)
+++ trunk/installation/src/clients/automatic_configuration_finish.ycp Fri Mar 28 13:37:20 2008
@@ -1,7 +1,8 @@
 /**
  * File:	clients/automatic_configuration_finish.ycp
  * Package:	installation
- * Summary:	Automatic configuration instead of the second stage (Preview)
+ * Summary:	Automatic configuration instead of the second stage.
+ *		DO NOT USE THIS CLIENT ANYMORE.
  * Authors:	Lukas Ocilka 
  * ThanksTo:	Martin Vidner 
  *		Ladislav Slezak 
@@ -19,6 +20,9 @@
 
     textdomain "installation";
 
+    y2error ("DO NOT USE THIS CLIENT ANYMORE!");
+    return `auto;
+
     any ret = nil;
     string func = "";
     map param = $[];

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=45831&r1=45830&r2=45831&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_automatic_configuration.ycp (original)
+++ trunk/installation/src/clients/inst_automatic_configuration.ycp Fri Mar 28 13:37:20 2008
@@ -1,7 +1,7 @@
 /**
  * File:	clients/inst_automatic_configuration.ycp
  * Package:	installation
- * Summary:	Automatic configuration instead of the second stage (Preview)
+ * Summary:	Automatic configuration instead of the second stage
  * Authors:	Lukas Ocilka 
  *
  * $Id:$
@@ -17,27 +17,34 @@
 
     textdomain "installation";
 
+    if (GetInstArgs::going_back()) {
+	y2milestone ("Going back, nothing to do here...");
+	return `auto;
+    }
+
     y2milestone ("automatic_configuration started");
 
     Mode::SetMode ("installation");
     Stage::Set ("continue");
 
+// TODO: read this from control file
+// (at least the list of modules in proposals)
     list  > proposal_scripts_to_call = [
 	// probably needed
-	$[ "type":"scripts",   "items":["netprobe"] ],
+	$[ "type":"scripts",   "items":["initialization", "netprobe", "rpmcopy_secondstage"] ],
 	// network proposal
 	$[ "type":"proposals", "items":["lan", "general", "dsl", "isdn", "modem", "remote", "firewall"] ],
 	// hardware proposal
 	$[ "type":"proposals", "items":["x11", "printer", "sound", "tv"] ],
 	// probably needed
-	$[ "type":"scripts",   "items":["suseconfig", "save_hardware_status"] ],
+	$[ "type":"scripts",   "items":["addon_update_sources", "inst_extrasources", "suseconfig", "save_hardware_status"] ],
     ];
 
-    // weird exception for users
-    if (FileUtils::Exists (Directory::vardir + "/users_first_stage.ycp")) {
-	y2milestone ("Users will be called");
-	proposal_scripts_to_call = add (proposal_scripts_to_call, $[ "type":"scripts", "items":["user"] ]);
-    }
+// users will be called if there is anything to write
+//    if (FileUtils::Exists (Directory::vardir + "/users_first_stage.ycp")) {
+//	y2milestone ("Users will be called");
+//	proposal_scripts_to_call = add (proposal_scripts_to_call, $[ "type":"scripts", "items":["user"] ]);
+//    }
 
     /**
      * Prepares the list of installation scripts to be executed.
@@ -101,13 +108,20 @@
 
 	foreach (string one_proposal, proposals_to_call, {
 	    y2milestone ("Calling script %1 MakeProposal", one_proposal);
-	    any result = WFM::CallFunction (one_proposal, ["MakeProposal", $[ "WriteOnly":true, "AutomaticConfiguration":true ]]);
+	    any result = WFM::CallFunction (one_proposal, ["MakeProposal", $[ "AutomaticConfiguration":true ]]);
 	    y2milestone ("Script %1 returned %2", one_proposal, result);
 	});
 
+	// TODO: handle errors, warnings ...
+	// foreach (string one_proposal, proposals_to_call, {
+	//    y2milestone ("Calling script %1 MakeProposal", one_proposal);
+	//    any result = WFM::CallFunction (one_proposal, ["Description", $[ "AutomaticConfiguration":true ]]);
+	//    y2milestone ("Script %1 returned %2", one_proposal, result);
+	//});
+
 	foreach (string one_proposal, proposals_to_call, {
 	    y2milestone ("Calling script %1 Write", one_proposal);
-	    any result = WFM::CallFunction (one_proposal, ["Write", $[ "WriteOnly":true, "AutomaticConfiguration":true ]]);
+	    any result = WFM::CallFunction (one_proposal, ["Write", $[ "AutomaticConfiguration":true ]]);
 	    y2milestone ("Script %1 returned %2", one_proposal, result);
 	});
     }
@@ -127,4 +141,6 @@
     });
 
     y2milestone ("automatic_configuration finished");
+
+    return `auto;
 }

Modified: trunk/installation/src/clients/inst_deploy_image.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_deploy_image.ycp?rev=45831&r1=45830&r2=45831&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_deploy_image.ycp (original)
+++ trunk/installation/src/clients/inst_deploy_image.ycp Fri Mar 28 13:37:20 2008
@@ -30,7 +30,7 @@
     {
 	last_image = image;
 	if (image < size (images))
-	    Progress::Title (sformat (_("Deploying Image \"%1\""), images[image]:""));
+	    Progress::Title (sformat (_("Deploying Image (%1/%2)..."), (image + 1), size (images)));
     }
     Progress::Step (image);
 }
@@ -38,31 +38,30 @@
 Wizard::SetContents (_("Deploying Installation Images"), `Empty (), "", false, false);
 Wizard::SetTitleIcon ("yast-inst-mode");
 
-// FIXME: help (if needed)
-Progress::Simple (_("Deploying Installation Images"), _("Deploying Installation Images"), size (images), "help");
-
 ImageInstallation::StoreAllChanges();
 
 Pkg::TargetFinish ();
 
-/*
-// FIXME the images usually do not fit in RAMDISK
+// TODO: help (if needed)
+Progress::Simple (_("Deploying Installation Images"), _("Deploying Installation Images"), size (images), "help");
+
+// Images usually do not fit into RAMDISK
 // move download area to hard disk (for HTTP/FTP media)
 // TODO select according to partitioning
-string download_dir = "/img_tmp";
-download_dir = Installation::destdir + download_dir;
+string download_dir = Installation::destdir + "/img_tmp";
 SCR::Execute (.target.bash, sformat ("test -d %1 || mkdir -p %1", download_dir));
 Pkg::SourceMoveDownloadArea (download_dir);
-// don't know why it didn't work :-(
-*/
 
 ImageInstallation::DeployImages (images, Installation::destdir, SetProgress);
 
-//SCR::Execute (.target.bash, sformat ("rmdir %1", download_dir));
+SCR::Execute (.target.bash, sformat ("rmdir '%1'", download_dir));
 
 y2milestone ("Target image for package selector prepared");
 
+Progress::Finish();
+
 Pkg::TargetInitialize (Installation::destdir);
+Pkg::TargetLoad ();
 
 ImageInstallation::RestoreAllChanges();
 

Modified: trunk/installation/src/clients/inst_finish.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_finish.ycp?rev=45831&r1=45830&r2=45831&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_finish.ycp (original)
+++ trunk/installation/src/clients/inst_finish.ycp Fri Mar 28 13:37:20 2008
@@ -100,8 +100,6 @@
 	    // copy logs just before 'umount'
 	    // keeps maximum logs available after reboot
 	    "copy_logs",
-	    // runs a separate process in SCR (chrooted)
-	    "automatic_configuration",
 	    "umount",
 	],
     ],

Modified: trunk/installation/src/clients/inst_prepare_image.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_prepare_image.ycp?rev=45831&r1=45830&r2=45831&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_prepare_image.ycp (original)
+++ trunk/installation/src/clients/inst_prepare_image.ycp Fri Mar 28 13:37:20 2008
@@ -31,7 +31,7 @@
 
 list <string> patterns_to_install = maplist (map  one_patern, all_patterns, {
     if (one_patern["status"]:`unknown == `selected || one_patern["status"]:`unknown == `installed) {
-	return one_patern["status"]:"";
+	return one_patern["name"]:"";
     } else {
 	return "";
     }
@@ -43,7 +43,13 @@
 
 // list images for currently selected patterns
 y2milestone ("Currently selected patterns: %1", patterns_to_install);
-ImageInstallation::FindImageSet (patterns_to_install);
 
-return `next;
+// avoid useles calls
+if (size (patterns_to_install) > 0) {
+    ImageInstallation::FindImageSet (patterns_to_install);
+}
+
+y2milestone ("Images for installation ready");
+
+return `auto;
 }

Modified: trunk/installation/src/clients/inst_software_selection.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_software_selection.ycp?rev=45831&r1=45830&r2=45831&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_software_selection.ycp (original)
+++ trunk/installation/src/clients/inst_software_selection.ycp Fri Mar 28 13:37:20 2008
@@ -115,7 +115,8 @@
 term contents = `HBox (
     `HStretch(),
     `HSquash (
-	`MinWidth (38, `VBox (
+	`VBox (
+	    `HSpacing (50),
 	    `VWeight (5, `VStretch()),
 	    // TRANSLATORS: Label (of a Radio button group)
 	    `Left (`Label (`opt(`boldFont), _("Select a System Type"))),
@@ -128,13 +129,13 @@
 	    `VSpacing (1),
 	    `VSquash (`Frame (
 		_("Description"),
-		`MinHeight (5, `RichText (
+		`MinHeight (7, `RichText (
 		    `id ("desktop_description"),
 		    ""
 		))
 	    )),
 	    `VWeight (5, `VStretch())
-	))
+	)
     ),
     `HStretch()
 );

Modified: trunk/installation/src/include/inst_inc_first.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_first.ycp?rev=45831&r1=45830&r2=45831&view=diff
==============================================================================
--- trunk/installation/src/include/inst_inc_first.ycp (original)
+++ trunk/installation/src/include/inst_inc_first.ycp Fri Mar 28 13:37:20 2008
@@ -41,7 +41,10 @@
 	}
 	
 	ProductControl::DisableModule ("add-on");
-	ProductControl::DisableModule  ("productsources");
+	ProductControl::DisableModule ("productsources");
+
+	// Enabled only when AC is selected
+	ProductControl::DisableModule ("automatic_configuration");
 
 	// First-stage users module will enable them again only if needed
 	ProductControl::DisableModule ("root");

Modified: trunk/installation/src/include/misc.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.ycp?rev=45831&r1=45830&r2=45831&view=diff
==============================================================================
--- trunk/installation/src/include/misc.ycp (original)
+++ trunk/installation/src/include/misc.ycp Fri Mar 28 13:37:20 2008
@@ -211,8 +211,10 @@
     void AdjustStepsAccordingToInstallationSettings () {
         if (ProductControl::GetUseAutomaticConfiguration()) {
             ProductControl::DisableAllModulesAndProposals ("installation", "continue");
+            ProductControl::EnableModule ("automatic_configuration");
 	} else {
 	    ProductControl::UnDisableAllModulesAndProposals ("installation", "continue");
+	    ProductControl::DisableModule ("automatic_configuration");
 	}
 
 	if (Installation::add_on_selected == true) {

Modified: trunk/installation/src/modules/ImageInstallation.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageInstallation.ycp?rev=45831&r1=45830&r2=45831&view=diff
==============================================================================
--- trunk/installation/src/modules/ImageInstallation.ycp (original)
+++ trunk/installation/src/modules/ImageInstallation.ycp Fri Mar 28 13:37:20 2008
@@ -96,14 +96,15 @@
 
 /**
  * Add information about new image
- * @param id string the id of the image
+ * @param name string the name/id of the image
  * @param file string the file name of the image
  * @param type string the type of the image, one of "tar" and "fs"
  */
-void AddImage (string id, string file, string type) {
-    _images[id] = $[
+void AddImage (string name, string file, string type) {
+    _images[file] = $[
 	"file" : file,
 	"type" : type,
+	"name" : name,
     ];
 }
 
@@ -130,7 +131,8 @@
     y2milestone ("Executing %1 returned %2", cmd, out);
 
     y2milestone ("Untarring the image");
-    cmd = sformat ("tar -xf %1 -C %2", image, target);
+    // FIXME: Progress `tar --checkpoint`
+    cmd = sformat ("tar --totals -xf %1 -C %2", image, target);
     out = (map)SCR::Execute (.target.bash_output, cmd);
     y2milestone ("Executing %1 returned %2", cmd, out);
     return out["exit"]:-1 == 0;
@@ -175,7 +177,7 @@
     y2milestone ("Executing %1 returned %2", cmd, out);
 
     y2milestone ("Unmounting image from temporary directory");
-    cmd = sformat ("umount %1", tmpdir);
+    cmd = sformat ("umount -d -f -l %1", tmpdir);
     out = (map)SCR::Execute (.target.bash_output, cmd);
     y2milestone ("Executing %1 returned %2", cmd, out);
     return out["exit"]:-1 == 0;
@@ -223,16 +225,18 @@
     {
 	y2error ("Image %1 does not exist", id);
     }
+
     string type = img["type"]:"";
+
     if (type == "fs")
 	return temporary
 	    ? MountFsImage (id, target)
 	    : DeployFsImage (id, target);
     else if (type == "tar")
 	return DeployTarImage (id, target);
+
     y2error ("Unknown type of image: %1", type);
     return false;
-
 }
 
 /**
@@ -242,7 +246,7 @@
  * @return boolean true on success
  */
 global boolean DeployImage (string id, string target) {
-    y2milestone ("Delploying image %1 to %2", id, target);
+    y2milestone ("Deploying image %1 to %2", id, target);
     return _DeployImage (id, target, false);
 }
 
@@ -284,6 +288,7 @@
  */
 global boolean DeployImages (list<string> images, string target, void(integer,integer) progress) {
     integer num = -1;
+
     foreach (string img, images, {
 	num = num + 1;
 	progress (num, 0);
@@ -291,8 +296,6 @@
     });
     progress (num, 100);
 
-    Pkg::TargetInitialize (target);
-    Pkg::TargetLoad ();
     return true;
 // TODO error checking
 }
@@ -316,6 +319,7 @@
 	y2milestone ("Image list for installation not found");
 	return true;
     }
+
     map image_descr = XML::XMLToYCPFile (filename);
     if (image_descr == nil)
     {
@@ -324,16 +328,21 @@
 	Report::Error (_("Failed to read information about installation images"));
 	return false;
     }
+
     list > image_sets = image_descr["image_sets"]:[];
     y2milestone ("Image set descriptions: %1", image_sets);
     map result = $[];
+
     foreach (map image, image_sets, {
 	string pattern = image["pattern"]:"";
-	if (pattern == "" && result == $[])
+
+	if (pattern == "" && result == $[]) {
 	    result = image;
-	else if (contains (patterns, pattern))
+	} else if (contains (patterns, pattern)) {
 	    result = image;
+	}
     });
+
     if (result == $[])
     {
 	Installation::image_installation = false;
@@ -341,20 +350,33 @@
 	y2milestone ("No image for installation found");
 	return true;
     }
+
     Installation::image_installation = true;
-    if (haskey (result, "pkg_image"))
+
+    if (haskey (result, "pkg_image")) {
 	_metadata_image = result["pkg_image"]:"";
-    else
+    } else {
 	Installation::image_only= true;
+    }
+
     foreach (map img, result["images"]:[], {
-	_image_order = add (_image_order, img["name"]:"");
+	// image must have unique <name>...</name> defined
+	if (img["file"]:"" == "") {
+	    y2error ("No file defined for %1", img);
+	    return;
+	}
+
+	_image_order = add (_image_order, img["file"]:"");
 	AddImage (img["name"]:"", img["file"]:"", img["type"]:"");
     });
+
     y2milestone ("Image-only installation: %1", Installation::image_only);
     y2milestone ("Images: %1", _images);
     y2milestone ("Image installation order: %1", _image_order);
+
     if (! Installation::image_only)
 	y2milestone ("Image with software management metadata: %1", _metadata_image);
+
     return true;
 }
 
@@ -450,7 +472,9 @@
     /**
      * List of all handled types.
      */
-    list <symbol> all_supported_types = [`product, `pattern, `selection, `language, `package, `patch];
+    // list <symbol> all_supported_types = [`product, `pattern, `selection, `language, `package, `patch];
+    // Zypp currently counts [ `product, `pattern, `selection, `language ]
+    list <symbol> all_supported_types = [`package, `patch];
 
     /**
      * Map that stores all the requested states of all handled/supported types.
@@ -538,7 +562,8 @@
 	    ret = false;
 	// They are not installed
 	} else {
-	    y2milestone ("Installing type: %1, details: %2,%3,%4", one_type, one_object["name"]:"", one_object["arch"]:"", one_object["version"]:"");
+	    y2milestone ("Installing type: %1, details: %2,%3,%4",
+		one_type, one_object["name"]:"", one_object["arch"]:"", one_object["version"]:"");
 	    // Confirm we want to install them (they might have been added as dependencies)
 	    Pkg::ResolvableInstallArchVersion (one_object["name"]:"", one_type, one_object["arch"]:"", one_object["version"]:"");
 	    // should be installed
@@ -564,37 +589,45 @@
             list  > to_install = filter (map  one_resolvable, resolvable_properties, {
                 return (one_resolvable["status"]:`unknown == `selected);
             });
-            Progress::NextStep();
 
-	    foreach (map  one_to_install, to_install, {
-		ProceedWithSelected (one_to_install, one_type);
-	    });
-	    Progress::NextStep();
+            Progress::NextStep();
 
 	    // All packages selected to be installed
 	    // [ $[ "arch" : ... , "name" : ... , "version" : ... ], ... ]
-	    list  > selected_for_installation = maplist (map one_resolvable, objects_state[one_type, "install"]:[], {
+	    list  > selected_for_installation = maplist (map one_resolvable, objects_state[one_type, "install"]:[], {
 		return $[ "arch":one_resolvable["arch"]:"", "name":one_resolvable["name"]:"", "version":one_resolvable["version"]:"" ];
 	    });
+
 	    Progress::NextStep();
 
-	    map  one_installed_resolvable = $[];
+	    // Delete all packages that are installed but should not be
+	    map  one_already_installed_resolvable = $[];
             foreach (map  one_resolvable, resolvable_properties, {
         	// We are interested in the already installed resolvables only
-                if (one_resolvable["status"]:`unknown != `installed)
+                if (one_resolvable["status"]:`unknown != `installed && one_resolvable["status"]:`unknown != `selected) {
 		    return;
+		}
 
-                one_installed_resolvable =  $[
+                one_already_installed_resolvable =  $[
 		    "arch":one_resolvable["arch"]:"", "name":one_resolvable["name"]:"", "version":one_resolvable["version"]:""
             	];
 
 		// Already installed resolvable but not in list of resolvables to be installed
-		if (! contains (selected_for_installation, one_installed_resolvable)) {
-		    y2milestone ("Removing type: %1, name: %2", one_type, one_resolvable["name"]:"-x-");
+		if (! contains (selected_for_installation, one_already_installed_resolvable)) {
+		    y2milestone ("Removing type: %1, name: %2 version: %3",
+			one_type, one_resolvable["name"]:"-x-", one_resolvable["version"]:"-x-");
 		    Pkg::ResolvableRemove (one_resolvable["name"]:"-x-", one_type);
 		}
             });
+
             Progress::NextStep();
+
+	    // Install all packages that aren't yet
+	    foreach (map  one_to_install, to_install, {
+		ProceedWithSelected (one_to_install, one_type);
+	    });
+
+	    Progress::NextStep();
         });
 
         Progress::Finish();

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r45831 - in /trunk/installation: control/ package/ src/clients/ src/include/ src/modules/

locilka＠svn.opensuse.org

tags

participants (1)