Hello community,
here is the log from the commit of package autoyast2
checked in at Tue Sep 2 18:08:43 CEST 2008.
--------
--- autoyast2/autoyast2.changes 2008-08-26 13:05:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2008-09-02 17:22:47.082501000 +0200
@@ -1,0 +2,27 @@
+Tue Sep 2 17:12:43 CEST 2008 - ug@suse.de
+
+- Read() button added to UI
+- UI changes
+- 2.17.7
+
+-------------------------------------------------------------------
+Tue Sep 2 14:23:45 CEST 2008 - ug@suse.de
+
+- to files section
+
+-------------------------------------------------------------------
+Thu Aug 28 10:21:45 CEST 2008 - ug@suse.de
+
+- arvin's multipath patch added
+
+-------------------------------------------------------------------
+Wed Aug 27 13:27:09 CEST 2008 - ug@suse.de
+
+- patch for ayast_setup applied. Thanx Bubli! :)
+
+-------------------------------------------------------------------
+Tue Aug 26 15:50:36 CEST 2008 - ug@suse.de
+
+- package automagic removed
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.17.6.tar.bz2
New:
----
autoyast2-2.17.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.y21853/_old 2008-09-02 18:06:07.000000000 +0200
+++ /var/tmp/diff_new_pack.y21853/_new 2008-09-02 18:06:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.17.6)
+# spec file for package autoyast2 (Version 2.17.7)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://www.suse.de/~ug
Name: autoyast2
-Version: 2.17.6
+Version: 2.17.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.17.6.tar.bz2
+Source0: autoyast2-2.17.7.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
# API for Disabled Modules (ProductControl)
@@ -61,7 +61,7 @@
%package installation
License: GPL v2 or later
-Version: 2.17.6
+Version: 2.17.7
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -83,7 +83,7 @@
Anas Nashif
%prep
-%setup -n autoyast2-2.17.6
+%setup -n autoyast2-2.17.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -235,6 +235,18 @@
%dir /var/lib/autoinstall
%dir /var/lib/autoinstall/autoconf
%changelog
+* Tue Sep 02 2008 ug@suse.de
+- Read() button added to UI
+- UI changes
+- 2.17.7
+* Tue Sep 02 2008 ug@suse.de
+- to files section
+* Thu Aug 28 2008 ug@suse.de
+- arvin's multipath patch added
+* Wed Aug 27 2008 ug@suse.de
+- patch for ayast_setup applied. Thanx Bubli! :)
+* Tue Aug 26 2008 ug@suse.de
+- package automagic removed
* Mon Aug 25 2008 ug@suse.de
- post-patterns added
- 2.17.6
++++++ autoyast2-2.17.6.tar.bz2 -> autoyast2-2.17.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/configure new/autoyast2-2.17.7/configure
--- old/autoyast2-2.17.6/configure 2008-08-26 12:59:12.000000000 +0200
+++ new/autoyast2-2.17.7/configure 2008-09-02 17:21:09.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for autoyast2 2.17.6.
+# Generated by GNU Autoconf 2.61 for autoyast2 2.17.7.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.17.6'
-PACKAGE_STRING='autoyast2 2.17.6'
+PACKAGE_VERSION='2.17.7'
+PACKAGE_STRING='autoyast2 2.17.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1205,7 +1205,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures autoyast2 2.17.6 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.17.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1276,7 +1276,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.17.6:";;
+ short | recursive ) echo "Configuration of autoyast2 2.17.7:";;
esac
cat <<\_ACEOF
@@ -1354,7 +1354,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.17.6
+autoyast2 configure 2.17.7
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1368,7 +1368,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by autoyast2 $as_me 2.17.6, which was
+It was created by autoyast2 $as_me 2.17.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2189,7 +2189,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.17.6'
+ VERSION='2.17.7'
cat >>confdefs.h <<_ACEOF
@@ -2417,7 +2417,7 @@
-VERSION="2.17.6"
+VERSION="2.17.7"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
@@ -3430,7 +3430,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by autoyast2 $as_me 2.17.6, which was
+This file was extended by autoyast2 $as_me 2.17.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3473,7 +3473,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-autoyast2 config.status 2.17.6
+autoyast2 config.status 2.17.7
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/configure.in new/autoyast2-2.17.7/configure.in
--- old/autoyast2-2.17.6/configure.in 2008-08-26 12:59:07.000000000 +0200
+++ new/autoyast2-2.17.7/configure.in 2008-09-02 17:21:04.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.17.6, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.17.7, http://bugs.opensuse.org/, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.6"
+VERSION="2.17.7"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/doc/CreateProfileDetails.xml new/autoyast2-2.17.7/doc/CreateProfileDetails.xml
--- old/autoyast2-2.17.6/doc/CreateProfileDetails.xml 2008-08-25 14:54:22.000000000 +0200
+++ new/autoyast2-2.17.7/doc/CreateProfileDetails.xml 2008-09-02 13:27:27.000000000 +0200
@@ -2404,9 +2404,14 @@
<para>
This feature requires the autoyast2 package to be installed. If the package is
missing, AutoYaST will silently ignore the <emphasis>files</emphasis> section.
- Since openSUSE 11.0 and SLES11 AutoYaST will install the package on it's own if
+ Since openSUSE 11.1 and SLES11 AutoYaST will install the package on it's own if
it's missing.
</para>
+ <para>
+ Since openSUSE 11.1 and SLES11 you can specify a <emphasis>file_location</emphasis>
+ where the file should be retrieved from, like an HTTP server for example. That would
+ look like this <emphasis><file_location>http://my.server.site/issue</file_location></emphasis>
+ </para>
&example.files;
<para>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/clients/ayast_setup.ycp new/autoyast2-2.17.7/src/clients/ayast_setup.ycp
--- old/autoyast2-2.17.6/src/clients/ayast_setup.ycp 2007-08-15 14:12:00.000000000 +0200
+++ new/autoyast2-2.17.7/src/clients/ayast_setup.ycp 2008-08-26 17:22:08.000000000 +0200
@@ -24,6 +24,10 @@
{
textdomain "autoinst";
+
+ y2milestone("----------------------------------------");
+ y2milestone("ayast_setup started");
+
import "Profile";
import "Popup";
import "Wizard";
@@ -33,78 +37,78 @@
import "AutoInstall";
import "AutoinstSoftware";
- void openFile( map options ) {
+ symbol GUI() {
+ Mode::SetUI("commandline");
+ CommandLine::Error(_("Empty parameter list"));
+ return `dummy;
+ }
+
+ void Setup() {
+
+ AutoInstall::Save();
+ Wizard::CreateDialog();
+ Mode::SetMode("autoinstallation");
+ Stage::Set ("continue");
+ WFM::CallFunction("inst_autopost", []);
+ AutoinstSoftware::addPostPackages(Profile::current["software","post-packages"]:[]);
+
+ // the following is needed since 10.3
+ // otherwise the already configured network gets removed
+ if( !haskey(Profile::current, "networking") ) {
+ Profile::current = add( Profile::current, "networking", $[ "keep_install_network":true ] );
+ }
+
+ Pkg::TargetInit ("/", false);
+ WFM::CallFunction("inst_rpmcopy", []);
+ WFM::CallFunction("inst_autoconfigure", []);
+
+ }
+
+ boolean openFile( map options ) {
+ if ( options["filename"]:nil == nil ) {
+ CommandLine::Error(_("Path to autoyast profile must be set"));
+ return false;
+ }
+
if( !Profile::ReadXML( options["filename"]:"" ) ) {
- Popup::Error(_("Error while parsing the control file.
+ Mode::SetUI("commandline");
+ CommandLine::Print(_("Error while parsing the control file.
Check the log files for more details or fix the
control file and try again.
"));
+ return false;
}
+
+ Setup();
+ return true;
}
map cmdline = $[
- "id" : "ay-client",
- // translators: command line help text for Samba client module
- "help" : _("autoyast"),
+ "id" : "ayast_setup",
+ "help" : _("Client for autoyast configuration on the running system"),
+ "guihandler": GUI,
"actions" : $[
- "setup" : $[ "handler":openFile, "help":"jo" ]
+ "setup" : $[
+ "handler" : openFile,
+ "help" : _("Configure the system using given autoyast profile"),
+ "example" : "setup filename=/path/to/profile" ]
],
"options" : $[
"filename": $[
- "type":"string",
- "help":"no help"
+ "type" : "string",
+ "help" : _("Path to autoyast profile")
]
],
"mappings" : $[
- "setup" : ["filename"]
- ]
- ];
- if(!CommandLine::Init(cmdline, WFM::Args()))
- {
- y2error("Commandline init failed");
- return false;
- }
- // command line options
- /* Init variables */
- string command = "";
- list flags = [];
- map options = $[];
- string exit = "";
- list l = [];
-
- while(!CommandLine::Done())
- {
- map m = CommandLine::Command();
- command = m["command"]:"exit";
- options = m["options"]:$[];
-
- if( command == "setup" ) {
- openFile(options);
- } else {
- /* maybe we got "exit" or "quit" */
- if( !CommandLine::Done() ) {
- CommandLine::Print("Unknown command (should not happen)");
- continue;
- }
- }
- }
-
- AutoInstall::Save();
- Wizard::CreateDialog();
- Mode::SetMode("autoinstallation");
- Stage::Set ("continue");
- WFM::CallFunction("inst_autopost", []);
- AutoinstSoftware::addPostPackages(Profile::current["software","post-packages"]:[]);
-
- // the following is needed since 10.3
- // otherwise the already configured network gets removed
- if( !haskey(Profile::current, "networking") ) {
- Profile::current = add( Profile::current, "networking", $[ "keep_install_network":true ] );
- }
-
- Pkg::TargetInit ("/", false);
- WFM::CallFunction("inst_rpmcopy", []);
- WFM::CallFunction("inst_autoconfigure", []);
+ "setup" : ["filename"]
+ ]
+ ];
+
+ any ret = CommandLine::Run( cmdline );
+
+ y2debug("ret = %1", ret);
+ y2milestone("----------------------------------------");
+ y2milestone("ayast_setup finished");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/config/files.desktop new/autoyast2-2.17.7/src/config/files.desktop
--- old/autoyast2-2.17.6/src/config/files.desktop 2008-05-19 14:46:35.000000000 +0200
+++ new/autoyast2-2.17.7/src/config/files.desktop 2008-09-02 11:38:56.000000000 +0200
@@ -16,7 +16,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstDataType=list
X-SuSE-YaST-AutoInstSchema=files.rnc
-X-SuSE-YaST-AutoInstRequires=users
+X-SuSE-YaST-AutoInstRequires=users,lan
Icon=yast-files
Exec=
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/include/conftree.ycp new/autoyast2-2.17.7/src/include/conftree.ycp
--- old/autoyast2-2.17.6/src/include/conftree.ycp 2008-08-19 11:40:29.000000000 +0200
+++ new/autoyast2-2.17.7/src/include/conftree.ycp 2008-09-02 17:12:23.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif
*
- * $Id: conftree.ycp 50195 2008-08-19 09:40:28Z ug $
+ * $Id: conftree.ycp 50584 2008-09-02 15:13:14Z ug $
*/
{
@@ -20,11 +20,10 @@
import "Profile";
import "Mode";
import "Stage";
+ import "Icon";
import "AutoinstSoftware";
- /* Stores the item list for popuplating the group selection box */
- list<term> Groups = [];
- map cachedSummaries = $[];
+ string title = _("Autoinstallation - Configuration");
any SaveAs() {
any filename = UI::AskForSaveFileName(AutoinstConfig::Repository, "*", _("Save as..."));
@@ -48,59 +47,198 @@
return `next;
}
-
+ /**
+ * Creates the group selection box with the specified YaST group selected.
+ *
+ * @param selectedGroup The group to select.
+ * @return The newly created `SelectionBox widget.
+ */
+ term groups( string selectedGroup ){
+ list<term> itemList = [];
+ foreach(string k, map v, Y2ModuleConfig::GroupMap, {
+ term item = `item( `id(k),`icon(v["Icon"]:""), v["Name"]:"", k == selectedGroup );
+ itemList = add(itemList, item );
+ });
+ return `SelectionBox( `id(`groups), `opt(`notify),"Groups", itemList );
+ }
/**
- * Create a list to be used with the table widget
- * @param current String defining the currently selected item/group
- * @return term The selection box widget.
- */
- define term CreateSelectionBox( string current ){
- /* select the item identified by 'current' */
- list<term> groups = maplist( term i, Groups, {
- list args = argsof( i );
- term id = args[0]:`Empty();
- string title = args[1]:"";
- if( id == `id( current ) ){
- return `item( id, title, true );
- }
- else{
- return i;
+ * Creates the modules selection box displaying modules in the specified group.
+ * The specified YaST module is selected.
+ *
+ * @param group_name YaST group of modules to display.
+ * @param selectedModule Module to preselect.
+ */
+ term modules (string group_name, string selectedModule ) {
+ y2milestone( "group_name: %1", group_name );
+ list<term> itemList = [];
+ foreach(string k , map v, Y2ModuleConfig::ModuleMap, ``{
+ if (v["X-SuSE-YaST-Group"]:"" == group_name)
+ {
+ term item = `item( `id(k),`icon(v["Icon"]:""), v["Name"]:"", k == selectedModule );
+ itemList = add(itemList, item );
+ }
+ });
+ if( 0 == size(itemList) ){
+ itemList = add( itemList, `item(`id("none"), "No modules available" ) );
}
- });
- term selectionBox = `SelectionBox( `id(`wizardTree), `opt(`notify), "", groups );
- return selectionBox;
+ map resourceMap = Y2ModuleConfig::GroupMap[group_name]:$[];
+ return `SelectionBox(`id(`modules), `opt(`notify), resourceMap["Name"]:"" + " - Modules", itemList );
+ }
+
+ /* Creates an `HBox containing the buttons to be displayed below the summary column
+ *
+ * @return The `HBox widget.
+ */
+ term buttons(){
+ Wizard::HideNextButton();
+ Wizard::HideBackButton();
+ Wizard::HideAbortButton();
+ return `HBox(
+ `PushButton( `id(`configure), "&Configure"),
+ `HSpacing(3),
+ `PushButton( `id(`read), "&Read"),
+ `PushButton( `id(`writeNow), "&Write"),
+ `PushButton( `id(`reset), "R&eset")
+ );
+ }
+
+ /**
+ * Creates a `VBox containg the summary of the specified module and the action buttons below.
+ *
+ * @param module_name The module to summarize.
+ * @return The `VBox widget.
+ */
+ term details (string module_name ){
+ map resourceMap = Y2ModuleConfig::ModuleMap[module_name]:$[];
+ string module_auto = resourceMap["X-SuSE-YaST-AutoInstClient"]:"none";
+ string summary = (string) WFM::CallFunction( module_auto,["Summary"]);
+ if( nil == summary )
+ summary = "";
+ return `VBox( `Left(`Label( resourceMap["Name"]:"" + " - Details" )),
+ `RichText( summary ),
+ buttons()
+ );
+ }
+
+ /**
+ * Sets the high level layout to 3 columns:
+ *
+ * - left: the YaST groups are displayed in a selection box
+ * - middle: the modules of the selected group are displayed in a selection box
+ * - right: the summary of the selected module is displayed, action buttons below
+ *
+ * @param preselectedGroup The YaST group to preselect
+ * @param preselectedModule The module to preselect
+ */
+ term layout (string preselectedGroup, string preselectedModule ){
+ return `HBox(
+ `HWeight(33, groups( preselectedGroup ) ),
+ `HWeight(33,
+ `ReplacePoint( `id(`rp_modules), modules(preselectedGroup, preselectedModule) )
+ ),
+ `HWeight(33,
+ `ReplacePoint( `id(`rp_details), details( preselectedModule )))
+ );
+ }
+
+ /* Prototype --- see below */
+ void updateModules();
+
+ /**
+ * Set the group selection box to the specified YaST group.
+ *
+ * @praram group_name YaST group to select.
+ */
+ void setGroup(string group_name){
+ UI::ChangeWidget(`id(`groups), `CurrentItem, group_name );
+ updateModules();
}
- /*
- * Wrapper functions for replacing tree wizard by a selection box.
+ /**
+ * Get the currently selected YaST group from the selection box widget.
+ *
+ * @return The currently selected group.
*/
- define void SelectTreeItem( string item ){
- y2milestone( "Selecting %1", `id(item) );
- UI::ChangeWidget( `id(`wizardTree), `CurrentItem, `id(item) );
+ string getGroup(){
+ return (string) UI::QueryWidget( `id(`groups), `CurrentItem);
}
- define string QueryTreeItem(){
- return (string) UI::QueryWidget( `id(`wizardTree), `CurrentItem );
+ /**
+ * Get the currently selected Module from the selection box widget.
+ *
+ * @return The currently selected module.
+ */
+ string getModule(){
+ return (string) UI::QueryWidget( `id(`modules), `CurrentItem);
}
- define void SetContents( string title, term contents,
- string help_text, boolean has_back,
- boolean has_next ){
- string current = "System";
- /* remember selected group */
- if( UI::WidgetExists( `id(`wizardTree) )){
- current = (string) UI::QueryWidget(`id(`wizardTree),`CurrentItem);
+ /* Prototype --- see below */
+ void updateDetails();
+
+ /**
+ * Updates the action button activation status. (Some modules are not
+ * clonable, some are not writeable).
+ *
+ * @param selectedModule The module to define the button status.
+ */
+ void updateButtons(string selectedModule){
+ /* enable/disable write button */
+ if( contains( AutoinstConfig::noWriteNow, selectedModule )){
+ UI::ChangeWidget(`id(`writeNow), `Enabled, false);
+ }
+ /* enable disable read button */
+ map resourceMap = Y2ModuleConfig::ModuleMap[selectedModule]:$[];
+ boolean clonable = resourceMap["X-SuSE-YaST-AutoInstClonable"]:"false" == "true";
+ if( ! clonable ){
+ UI::ChangeWidget(`id(`read), `Enabled, false );
+ }
+ }
+
+ /**
+ * Set the module selection box to the specified YaST module and
+ * update the details and group column.
+ *
+ * @param module_name The module to select.
+ */
+ void setModule(string module_name){
+ map resourceMap = Y2ModuleConfig::ModuleMap[module_name]:$[];
+ if( $[] != resourceMap ){
+ string group = resourceMap["X-SuSE-YaST-Group"]:"";
+ if( "" != group ){
+ setGroup( group );
}
- /* add selection box */
- contents = `HBox( `HWeight(25, CreateSelectionBox(current) ),
- `HWeight(75, contents ));
- Wizard::SetContents( title, contents, help_text, has_back, has_next);
+ UI::ChangeWidget(`id(`modules), `CurrentItem, module_name );
+ updateDetails();
+ }
+ }
+
+ /**
+ * Update the modules selection box, e.g. after the user selected a different
+ * group. Updates the details section also.
+ */
+ void updateModules(){
+ string selectedGroup = getGroup();
+ y2milestone( "group: %1", selectedGroup );
+ term newModules = modules( selectedGroup, "");
+ UI::ReplaceWidget( `id(`rp_modules), newModules );
+ updateDetails();
+ }
+
+ /**
+ * Update the details section, e.g. after a different module was selected.
+ */
+ void updateDetails(){
+ string selectedModule = (string) UI::QueryWidget( `id(`modules), `CurrentItem);
+ y2milestone( "module: %1", selectedModule );
+ term newDetails = details( selectedModule );
+ UI::ReplaceWidget( `id(`rp_details), newDetails );
+ updateButtons( selectedModule );
}
/**
* Reset Configuration
- * @param resource Resource
+ * @param resource Module/Resource to reset
* @return any
*/
any resetModule(string resource)
@@ -118,7 +256,23 @@
}
/**
+ * Read the setting of the specifed module from the current system.
+ *
+ * @param module_name The module to read in.
+ */
+ boolean readModule(string module_name){
+ map resourceMap = Y2ModuleConfig::ModuleMap[module_name]:$[];
+ string auto = resourceMap["X-SuSE-YaST-AutoInstClient"]:"";
+
+ Call::Function(auto , ["Read"]);
+ Call::Function(auto , ["SetModified"]);
+ Profile:prepare = true;
+ return true;
+ }
+ /**
* Configure module
+ * @param resource Module/Resource to configure
+ * @return any
*/
any configureModule(string resource)
{
@@ -129,20 +283,22 @@
string module_auto = resourceMap["X-SuSE-YaST-AutoInstClient"]:"none";
y2debug("module_auto: %1", module_auto );
+ y2milestone("Mode::mode %1", Mode::mode());
any original_settings = WFM::CallFunction(module_auto, ["Export"]);
any seq = WFM::CallFunction(module_auto, ["Change"]);
- y2debug("Change response: %1", seq);
+ y2milestone("Change response: %1", seq);
if (seq == `accept || seq == `next || seq == `finish)
{
any new_settings = WFM::CallFunction(module_auto, ["Export"]);
if (new_settings == nil)
{
+ y2milestone("Importing original settings.");
Popup::Error(_("The module returned invalid data."));
WFM::CallFunction(module_auto, ["Import", original_settings]);
return `abort;
} else {
- y2debug("original=%1", original_settings);
- y2debug("new=%1", new_settings);
+ y2milestone("original=%1", original_settings);
+ y2milestone("new=%1", new_settings);
if (original_settings!=new_settings )
{
WFM::CallFunction(module_auto, ["SetModified"]);
@@ -158,9 +314,10 @@
/**
- * @return menu term
+ * Sets the menus in the wizard.
+ * @return void
*/
- define void menus ()
+ define void menus ()
{
list<map> Menu = [];
Menu = Wizard::AddMenu( Menu , _("&File"), "file-menu" );
@@ -206,143 +363,21 @@
}
/**
- * Get Group name
- */
- string groupName (string tree_item) {
- list<string> tok = splitstring(tree_item, "@");
- string type = tok[0]:"";
- if (type == "group")
- return tok[1]:"";
- else
- return "";
- }
-
- /**
- * Get module name
- */
- string moduleName (string tree_item) {
- list<string> tok = splitstring(tree_item, "@");
- string type = tok[0]:"";
- if (type == "module")
- return tok[1]:"";
- else
- return "";
- }
-
- /**
- * Return HTML list of available modules with summaries
- *
- * @param string group_name - group to display
- * @param string module_name - module to refresh. use:
- * o "ALL" to refresh all
- * o "" or a non-existant module name to refresh non (use cache for all)
- * o "<module nam> refresh that module
- *
- * @return term VBox widget containing:
- * o richtext window with modules listed and linked
- * o three ComboBoxes for configuring, writing and resetting modules
+ * Create the complete dialog (called in wizard.ycp and in MainDialog())
+ * @param currentGroup Group to select.
+ * @param currentModule Module to select.
+ * @return void
*/
- term modules (string group_name, string module_name) {
- y2milestone( "group_name: %1", group_name );
- string html = "";
- list<term> moduleItems = [];
- list<term> writeNowModules = [];
- boolean useCache = true;
- boolean feedBackVisible = false;
- if( module_name == "ALL" ){
- useCache = false;
+ define void CreateDialog(string currentGroup, string currentModule ) ``{
+ if( "" == currentGroup || nil == currentGroup ){
+ currentGroup = "System";
}
-
- foreach(string k , map v, Y2ModuleConfig::ModuleMap, ``{
- if (v["X-SuSE-YaST-Group"]:"" == group_name)
- {
- string typedModulename = "module@" + k;
- string colored = HTML::Colorize( HTML::Link(v["Name"]:"", typedModulename), "#8BC460");
- term i = `item( `id(typedModulename), v["Name"]:"", false );
- moduleItems = add( moduleItems, i );
- if( !contains( AutoinstConfig::noWriteNow, k ) ){
- writeNowModules = add( writeNowModules, i );
- }
- html = html + "<li>" +HTML::Heading(colored);
- string summary = cachedSummaries[k]:"";
- if( useCache == true && module_name != k && summary != "" ){
- y2debug("Using cached summary for %1", k );
- }
- else{
- map resourceMap = Y2ModuleConfig::ModuleMap[k]:$[];
- if( resourceMap != $[] ){
- y2debug("Refreshing summary for %1", k );
- if( ! feedBackVisible ){
- Popup::ShowFeedback(_("Refreshing summary"),
- _("Please wait while summary information is gathered.") );
- feedBackVisible = true;
- }
- summary = (string) WFM::CallFunction( resourceMap["X-SuSE-YaST-AutoInstClient"]:"none",
- ["Summary"]);
- if( nil == summary ){
- summary = "";
- }
- cachedSummaries[k] = summary;
- }
- else{
- summary = HTML::Para(v["GenericName"]:"");
- }
- }
- // add <UL> only if it's not already there
- string summary_start = substring(summary,0,3);
- if(summary_start != " 0 ) {
- currentFile = substring( currentFile, findlastof(currentFile,"/")+1 );
- label = label + " - " + currentFile;
- }
- SetContents(label,
- contents, AutoinstConfig::MainHelp(), true , true);
- Wizard::SetTitleIcon(Icons[group]:tolower(group));
- }
- else if (modulename!="")
- {
- string group = groupName(QueryTreeItem());
- any configret = configureModule(modulename);
- y2debug("configureModule ret : %1", configret);
- SetContents(_("Available modules"),
- modules(group, modulename), AutoinstConfig::MainHelp(), true , true);
- }
}
+ else if( ret == `read ){
+ currentGroup = getGroup();
+ currentModule = getModule();
+ resetModule(currentModule);
+ readModule(currentModule);
+ if( UI::WidgetExists(`id(`rp_details) ) ){
+ /* if dialog didn't replace wizard contents this is enough */
+ updateDetails();
+ }
+ else{
+ /* otherwise we have to rebuild the complete wizard */
+ CreateDialog(currentGroup, currentModule);
+ }
+ }
else if (ret == "menu_tree") // source -> tree
{
y2debug("change to tree");
- tree_item = QueryTreeItem();
- if (tree_item == "")
- tree_item = "group@System";
- y2debug("tree_item: %1", tree_item );
- string group=groupName(tree_item);
- string modulename=moduleName(tree_item);
-
- contents = `Empty();
-
- if (group!="" )
- {
- contents = modules(group, modulename);
- SetContents(_("Available modules"),
- contents, AutoinstConfig::MainHelp(), true , true);
- Wizard::SetTitleIcon(Icons["group"]:tolower(group));
- }
+ CreateDialog(currentGroup, currentModule);
}
else if (ret == "menu_open") // OPEN
{
@@ -561,32 +547,36 @@
}
else
{
- tree_item = QueryTreeItem();
- string group=groupName(tree_item);
- string modulename=moduleName(tree_item);
+ string group=getGroup();
+ string modulename=getModule();
- contents = `Empty();
+ term contents = `Empty();
if (group!="" )
{
- contents = modules(group, modulename);
- string caption = _("Available modules");
+ contents = layout(group, modulename);
+ string caption = title;
string currentFile = AutoinstConfig::currentFile;
currentFile = substring( currentFile, findlastof(currentFile,"/")+1 );
if( size(currentFile) > 0 ) {
caption = caption + " - " + currentFile;
}
- SetContents(caption,
+ Wizard::SetContents(caption,
contents, AutoinstConfig::MainHelp(), true , true);
Wizard::SetTitleIcon(Icons[group]:tolower(group));
+ updateButtons(modulename);
}
}
ret = `menu_open;
}
else if (ret == "menu_source") // Show SOURCE
{
+ /* save previously selected group and module,
+ * so we can restore them afterwards
+ */
+ currentGroup = getGroup();
+ currentModule = getModule();
ShowSource();
- tree_item = "System";
ret = `menu_source;
}
else if (ret == "menu_save") // SAVE
@@ -634,10 +624,11 @@
if (UI::WidgetExists(`id(`class_source))) {
ShowSource();
}
- tree_item = QueryTreeItem();
- string group=groupName(tree_item);
- SetContents(_("Available Modules"),
- modules(group, ""), AutoinstConfig::MainHelp(), true , true);
+ string group=getGroup();
+ string module_name=getModule();
+ Wizard::SetContents(_("Available Modules"),
+ layout(group, module_name), AutoinstConfig::MainHelp(), true , true);
+ updateButtons(module_name);
ret = `menu_new;
}
else if (ret == "change_encryption" ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/include/wizards.ycp new/autoyast2-2.17.7/src/include/wizards.ycp
--- old/autoyast2-2.17.6/src/include/wizards.ycp 2008-08-19 11:40:29.000000000 +0200
+++ new/autoyast2-2.17.7/src/include/wizards.ycp 2008-09-02 17:12:23.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif
*
- * $Id: wizards.ycp 50195 2008-08-19 09:40:28Z ug $
+ * $Id: wizards.ycp 50584 2008-09-02 15:13:14Z ug $
*/
{
textdomain "autoinst";
@@ -85,14 +85,13 @@
string caption = _("Autoinstall Configuration");
term contents = `Label (_("Initializing ..."));
Wizard::CreateDialog();
- string tree_item = "System";
Wizard::SetContentsButtons ( caption,
contents,
AutoinstConfig::MainHelp(),
Label::BackButton (),
Label::NextButton ());
- CreateDialog( tree_item);
+ CreateDialog( "System", "general" );
menus();
symbol ret = Sequencer::Run(dialogs, sequence);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/modules/AutoinstClone.ycp new/autoyast2-2.17.7/src/modules/AutoinstClone.ycp
--- old/autoyast2-2.17.6/src/modules/AutoinstClone.ycp 2008-08-14 14:25:40.000000000 +0200
+++ new/autoyast2-2.17.7/src/modules/AutoinstClone.ycp 2008-09-02 17:12:23.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Anas Nashif
*
- * $Id: AutoinstClone.ycp 50071 2008-08-14 12:25:44Z ug $
+ * $Id: AutoinstClone.ycp 50584 2008-09-02 15:13:14Z ug $
*
*
*/
@@ -58,6 +58,9 @@
/**
* Set root password
*/
+
+ /* useless */
+ /*
define list root() ``{
list<map> shadow = (list<map>) SCR::Read(.etc.shadow);
map rootacct = (map) filter(map acct, shadow, ``(acct["username"]:"" == "root"))[0]:$[];
@@ -69,6 +72,7 @@
users = add(users, rootacct_mod);
return users;
}
+ */
/**
@@ -78,6 +82,8 @@
* @param list mount points
* @return string
*/
+ /* useless */
+ /*
define string findMountpoint(string device, map p, list<map> mounts)
{
string mountPoint = "";
@@ -90,17 +96,21 @@
});
return mountPoint;
}
+ */
/**
* Convert units to size
* @param list region
* @return integer size
*/
+ /* useless */
+ /*
define integer units_to_size (list region)
{
integer units = (integer) region[1]:0;
return (units * bytes_per_unit) - bytes_per_unit + 1;
};
+ */
/**
@@ -409,25 +419,6 @@
/**
- * Bootloader options
- * @return map bootloader options
- */
- global define map Bootloader()
- {
- map bootloader = $[];
-
- boolean readret = (boolean)Call::Function("bootloader_auto", ["Read", $[] ]);
- if (readret)
- {
- bootloader = (map)Call::Function("bootloader_auto", ["Export", $[] ]);
- }
-
- return bootloader;
-
- };
-
-
- /**
* General options
* @return map general options
*/
@@ -582,9 +573,6 @@
Call::Function("software_auto" , ["Import", Software()]);
Call::Function("software_auto" , ["SetModified"]);
- Call::Function("bootloader_auto" , ["Import", Bootloader()]);
- Call::Function("bootloader_auto" , ["SetModified"]);
-
Call::Function("general_auto" , ["Import", General()]);
Call::Function("general_auto" , ["SetModified"]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/modules/AutoinstConfig.ycp new/autoyast2-2.17.7/src/modules/AutoinstConfig.ycp
--- old/autoyast2-2.17.6/src/modules/AutoinstConfig.ycp 2008-07-01 10:31:42.000000000 +0200
+++ new/autoyast2-2.17.7/src/modules/AutoinstConfig.ycp 2008-08-27 13:28:40.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif
*
- * $Id: AutoinstConfig.ycp 48691 2008-07-01 08:32:26Z ug $
+ * $Id: AutoinstConfig.ycp 50406 2008-08-27 11:29:31Z ug $
*/
{
module "AutoinstConfig";
@@ -353,10 +353,12 @@
Repository = "/var/lib/autoinstall/repository";
}
}
- else if (Mode::test () && Mode::normal ())
+ //This probably gets never executed and it only breaks the commandline iface
+ //by Mode::test() call which instantiates UI
+ /*else if (Mode::test () && Mode::normal ())
{
local_rules_file = (string)WFM::Args(1);
- }
+ }*/
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/modules/AutoinstFile.ycp new/autoyast2-2.17.7/src/modules/AutoinstFile.ycp
--- old/autoyast2-2.17.6/src/modules/AutoinstFile.ycp 2007-05-21 12:26:37.000000000 +0200
+++ new/autoyast2-2.17.7/src/modules/AutoinstFile.ycp 2008-09-02 14:24:11.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Anas Nashif (nashif@suse.de)
* Summary: Handle complete configuration file dumps
*
- * $Id: AutoinstFile.ycp 27288 2006-01-24 14:29:15Z ug $
+ * $Id: AutoinstFile.ycp 50568 2008-09-02 12:25:24Z ug $
*/
{
module "AutoinstFile";
@@ -13,6 +13,7 @@
import "AutoinstConfig";
import "Summary";
+ include "autoinstall/io.ycp";
/* default value of settings modified */
global boolean modified = false;
@@ -93,10 +94,10 @@
foreach(map file, Files,
``{
+ string alternate_location = sformat("%1/%2", AutoinstConfig::files_dir, counter);
+ string alter_file = sformat("file_%1", counter);
if (file["file_contents"]:"" != "")
{
- string alternate_location = sformat("%1/%2", AutoinstConfig::files_dir, counter);
- string alter_file = sformat("file_%1", counter);
y2milestone("AutoInstall: Copying file %1", file["file_path"]:alternate_location );
list t = splitstring( file["file_path"]:alternate_location, "/");
integer pos = size(t) - 1;
@@ -104,56 +105,60 @@
// SCR::Write (.target.string, AutoInstall::var_dir + "/files" + t[pos]:alter_file, file["file_contents"]:"");
SCR::Write (.target.string, file["file_path"]:alternate_location , file["file_contents"]:"");
- if (file["file_permissions"]:"" != "")
+ } else if( file["file_location"]:"" != "" ) {
+ y2milestone("trying to get file from %1 storing in %2", file["file_location"]:"", file["file_path"]:alternate_location);
+ if (!GetURL(file["file_location"]:"", file["file_path"]:alternate_location ) ) {
+ y2error("file could not be retrieved");
+ } else {
+ y2milestone("file was retrieved");
+ }
+ }
+ if (file["file_permissions"]:"" != "") {
+ SCR::Execute (.target.bash, sformat("chmod %1 %2", file["file_permissions"]:"", file["file_path"]:alternate_location ));
+ }
+ if (file["file_owner"]:"" != "") {
+ SCR::Execute (.target.bash, sformat("chown %1 %2", file["file_owner"]:"", file["file_path"]:alternate_location ));
+ }
+ map script = file["file_script"]:$[];
+ if (script != $[])
+ {
+ string current_logdir = AutoinstConfig::logs_dir;
+ list name_tok = splitstring(file["file_path"]:alternate_location, "/");
+ string scriptName = "";
+ if (size(name_tok)>0)
{
- SCR::Execute (.target.bash, sformat("chmod %1 %2", file["file_permissions"]:"", file["file_path"]:alternate_location ));
+ string name = name_tok[size(name_tok) - 1 ]:"";
+ scriptName = "script_" + name;
}
- if (file["file_owner"]:"" != "")
+ string scriptPath = sformat("%1/%2", AutoinstConfig::scripts_dir, scriptName);
+ y2milestone("Writing (file) script into %1", scriptPath);
+ SCR::Write(.target.string, scriptPath, script["source"]:"echo Empty script!");
+ // string message = sformat(_("Executing user supplied script: %1"), scriptName);
+
+ string scriptInterpreter = script["interpreter"]:"shell";
+ string executionString = "";
+ if (scriptInterpreter == "shell")
{
- SCR::Execute (.target.bash, sformat("chown %1 %2", file["file_owner"]:"", file["file_path"]:alternate_location ));
+ executionString = sformat("/bin/sh -x %1 2&> %2/%3.log", scriptPath, current_logdir, scriptName);
+ SCR::Execute (.target.bash, executionString);
}
-
- map script = file["file_script"]:$[];
- if (script != $[])
+ else if (scriptInterpreter == "perl")
+ {
+ executionString = sformat("/usr/bin/perl %1 2&> %2/%3.log", scriptPath, current_logdir, scriptName);
+ SCR::Execute (.target.bash,executionString);
+ }
+ else if (scriptInterpreter == "python")
+ {
+ executionString = sformat("/usr/bin/python %1 2&> %2/%3.log", scriptPath, current_logdir, scriptName);
+ SCR::Execute (.target.bash,executionString);
+ }
+ else
{
- string current_logdir = AutoinstConfig::logs_dir;
- list name_tok = splitstring(file["file_path"]:alternate_location, "/");
- string scriptName = "";
- if (size(name_tok)>0)
- {
- string name = name_tok[size(name_tok) - 1 ]:"";
- scriptName = "script_" + name;
- }
- string scriptPath = sformat("%1/%2", AutoinstConfig::scripts_dir, scriptName);
- y2milestone("Writing (file) script into %1", scriptPath);
- SCR::Write(.target.string, scriptPath, script["source"]:"echo Empty script!");
- // string message = sformat(_("Executing user supplied script: %1"), scriptName);
-
- string scriptInterpreter = script["interpreter"]:"shell";
- string executionString = "";
- if (scriptInterpreter == "shell")
- {
- executionString = sformat("/bin/sh -x %1 2&> %2/%3.log", scriptPath, current_logdir, scriptName);
- SCR::Execute (.target.bash, executionString);
- }
- else if (scriptInterpreter == "perl")
- {
- executionString = sformat("/usr/bin/perl %1 2&> %2/%3.log", scriptPath, current_logdir, scriptName);
- SCR::Execute (.target.bash,executionString);
- }
- else if (scriptInterpreter == "python")
- {
- executionString = sformat("/usr/bin/python %1 2&> %2/%3.log", scriptPath, current_logdir, scriptName);
- SCR::Execute (.target.bash,executionString);
- }
- else
- {
- y2error("Unknown interpreter: %1", scriptInterpreter);
- }
- y2milestone("Script Execution command: %1", executionString );
+ y2error("Unknown interpreter: %1", scriptInterpreter);
}
- success = ( SCR::Execute (.target.bash, sformat("cp %1 %2", file["file_path"]:alternate_location, AutoinstConfig::files_dir)) == 0 );
+ y2milestone("Script Execution command: %1", executionString );
}
+ success = ( SCR::Execute (.target.bash, sformat("cp %1 %2", file["file_path"]:alternate_location, AutoinstConfig::files_dir)) == 0 );
counter = counter + 1;
});
return success;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/modules/AutoinstRAID.ycp new/autoyast2-2.17.7/src/modules/AutoinstRAID.ycp
--- old/autoyast2-2.17.6/src/modules/AutoinstRAID.ycp 2007-05-21 12:26:37.000000000 +0200
+++ new/autoyast2-2.17.7/src/modules/AutoinstRAID.ycp 2008-09-01 16:42:13.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: RAID
* Authors: Anas Nashif
*
- * $Id: AutoinstRAID.ycp 27288 2006-01-24 14:29:15Z ug $
+ * $Id: AutoinstRAID.ycp 50531 2008-09-01 14:43:23Z ug $
*/
{
@@ -78,6 +78,9 @@
* Return deleted MDs
* @return list list of deleted MDs
*/
+
+ /* useless */
+ /*
global define list DeletedMDs ( string md ) {
list ret = [];
foreach( string dev, map devmap, Storage::GetTargetMap(),
@@ -97,12 +100,16 @@
return( flatten(ret) );
}
+ */
/**
* Delete MDs
* @return list list of deleted MDs
*/
+
+ /* useless */
+ /*
global define list DeleteMDs () {
list to_bo_deleted = [];
foreach( string dev, map devmap, Storage::GetTargetMap(), ``{
@@ -133,7 +140,7 @@
Storage::SetTargetMap(targetMap);
}
}
-
+*/
define boolean remove_possible_mds () {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/modules/AutoinstSoftware.ycp new/autoyast2-2.17.7/src/modules/AutoinstSoftware.ycp
--- old/autoyast2-2.17.6/src/modules/AutoinstSoftware.ycp 2008-08-25 14:09:43.000000000 +0200
+++ new/autoyast2-2.17.7/src/modules/AutoinstSoftware.ycp 2008-09-02 17:18:51.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Software
* Authors: Anas Nashif
*
- * $Id: AutoinstSoftware.ycp 50355 2008-08-25 12:10:27Z ug $
+ * $Id: AutoinstSoftware.ycp 50586 2008-09-02 15:20:04Z ug $
*
*/
{
@@ -16,7 +16,6 @@
import "Stage";
import "SpaceCalculation";
import "Packages";
- import "Popup";
import "Report";
import "Kernel";
import "AutoinstConfig";
@@ -260,71 +259,6 @@
}
}
- if (haskey(Profile::current, "inetd")) {
- map conf = Profile::current["inetd"]:$[];
- if (conf["netd_service"]:`none == `xinetd )
- allpackages = (list<string>) union(allpackages,
- ["xinetd"]);
- else
- allpackages = (list<string>) union(allpackages,
- ["inetd"]);
-
- }
-
- if (haskey(Profile::current, "nis")) {
- map conf = Profile::current["nis"]:$[];
- if (conf["start_nis"]:false)
- allpackages = (list<string>) union(allpackages, ["yast2-nis-client","ypbind"]);
-
- if (conf["start_autofs"]:false)
- {
- string pkg = "autofs4";
- allpackages = add (allpackages, pkg);
- }
- }
-
- if (haskey(Profile::current, "security")) {
- allpackages = (list<string>) union(allpackages,
- ["yast2-security"]);
- }
-
- if (haskey(Profile::current, "ldap")) {
- map ldapclient = Profile::current["ldap"]:$[];
- if (ldapclient["start_ldap"]:false)
- allpackages = (list<string>) union(allpackages, ["pam_ldap","nss_ldap"]);
- if (ldapclient["start_autofs"]:false)
- {
- string pkg = "autofs4";
- allpackages = add (allpackages, pkg);
- }
- }
-
- if (haskey(Profile::current, "nfs_server"))
- {
- boolean start_nfsserver = Profile::current["nfs_server", "start_nfsserver"]:false;
- if (start_nfsserver)
- allpackages = (list<string>) union(allpackages, ["yast2-nfs-server", "nfs-kernel-server"]);
- }
-
-
- if (haskey(Profile::current, "mail")) {
- map mail = Profile::current["mail"]:$[];
- if (mail["mta"]:`other == `postfix)
- {
- allpackages = add(allpackages, "postfix");
- PackageAI::toremove = add(PackageAI::toremove, "sendmail");
- if (mail["use_amavis"]:false)
- allpackages = add(allpackages, "amavis-postfix");
- }
- else if (mail["mta"]:`other == `sendmail)
- {
- allpackages = add(allpackages, "sendmail");
- PackageAI::toremove = add(PackageAI::toremove, "postfix");
-
- if (mail["use_amavis"]:false)
- allpackages = add(allpackages, "amavis-sendmail");
- }
- }
return allpackages;
}
@@ -370,7 +304,8 @@
Report::Warning(sformat(_("Could not set patterns: %1."), mergestring(failed, ",")));
}
- list<string> autoinstPacks = autoinstPackages ();
+// list<string> autoinstPacks = autoinstPackages ();
+ list<string> autoinstPacks = PackageAI::toinstall;
y2milestone("Packages selected in autoinstall mode: %1", autoinstPacks);
if (size(autoinstPacks) > 0 )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/modules/AutoinstStorage.ycp new/autoyast2-2.17.7/src/modules/AutoinstStorage.ycp
--- old/autoyast2-2.17.6/src/modules/AutoinstStorage.ycp 2008-08-14 14:25:40.000000000 +0200
+++ new/autoyast2-2.17.7/src/modules/AutoinstStorage.ycp 2008-09-01 11:58:22.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Storage
* Authors: Anas Nashif
*
- * $Id: AutoinstStorage.ycp 50071 2008-08-14 12:25:44Z ug $
+ * $Id: AutoinstStorage.ycp 50511 2008-09-01 09:59:31Z ug $
*/
{
module "AutoinstStorage";
@@ -76,7 +76,8 @@
string mbr_disk = "";
if( after == "" ) {
foreach (string device, map disk, initial_target_map, ``{
- if (disk["type"]:`jo == `CT_DMRAID)
+ if (disk["type"]:`jo == `CT_DMRAID ||
+ disk["type"]:`jo == `CT_DMMULTIPATH)
{
mbr_disk = device;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/modules/Profile.ycp new/autoyast2-2.17.7/src/modules/Profile.ycp
--- old/autoyast2-2.17.6/src/modules/Profile.ycp 2008-08-20 17:07:21.000000000 +0200
+++ new/autoyast2-2.17.7/src/modules/Profile.ycp 2008-08-27 13:28:40.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Profile handling
* Authors: Anas Nashif
*
- * $Id: Profile.ycp 50244 2008-08-20 15:06:49Z ug $
+ * $Id: Profile.ycp 50406 2008-08-27 11:29:31Z ug $
*/
{
module "Profile";
@@ -18,6 +18,7 @@
import "Popup";
import "ProductControl";
import "Directory";
+ import "FileUtils";
import "PackageSystem";
include "autoinstall/xml.ycp";
@@ -654,6 +655,9 @@
* @return boolean
*/
global define boolean ReadXML (string file) {
+ if ( !FileUtils::Exists( file ) )
+ return false;
+
string tmp = (string)SCR::Read (.target.string, file);
list<string> l = splitstring (tmp, "\n");
if( tmp != nil && l[0]:"" == "-----BEGIN PGP MESSAGE-----" ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/src/modules/Y2ModuleConfig.ycp new/autoyast2-2.17.7/src/modules/Y2ModuleConfig.ycp
--- old/autoyast2-2.17.6/src/modules/Y2ModuleConfig.ycp 2007-05-21 12:26:37.000000000 +0200
+++ new/autoyast2-2.17.7/src/modules/Y2ModuleConfig.ycp 2008-09-02 17:12:23.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Read data from desktop files
* Author: Anas Nashif
*
- * $Id: Y2ModuleConfig.ycp 28187 2006-02-20 11:45:21Z locilka $
+ * $Id: Y2ModuleConfig.ycp 50584 2008-09-02 15:13:14Z ug $
*/
{
@@ -42,6 +42,7 @@
list<string> Values= [ "Name",
"GenericName",
+ "Icon",
"X-SuSE-YaST-AutoInst",
"X-SuSE-YaST-AutoInstResource",
"X-SuSE-YaST-AutoInstClient",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.17.6/VERSION new/autoyast2-2.17.7/VERSION
--- old/autoyast2-2.17.6/VERSION 2008-08-26 12:58:31.000000000 +0200
+++ new/autoyast2-2.17.7/VERSION 2008-09-02 17:18:41.000000000 +0200
@@ -1 +1 @@
-2.17.6
+2.17.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org