Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (1670 mails)

< Previous Next >
commit autoyast2
  • From: root@xxxxxxx (h_root)
  • Date: Mon, 9 Oct 2006 17:55:51 +0200 (CEST)
  • Message-id: <20061009155551.42DFA19A9FA@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package autoyast2
checked in at Mon Oct 9 17:55:51 CEST 2006.

--------
--- autoyast2/autoyast2.changes 2006-09-20 11:32:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2006-10-09 16:24:50.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Oct 9 16:12:21 CEST 2006 - ug@xxxxxxx
+
+- experimental imaging feature added
+- strict schema check in cloning and saving added
+- some schema updates
+- 2.14.8
+
+-------------------------------------------------------------------
+Thu Sep 21 11:26:44 CEST 2006 - ug@xxxxxxx
+
+- fix in partition edit dialog (#206681)
+
+-------------------------------------------------------------------

Old:
----
autoyast2-2.14.7.tar.bz2

New:
----
autoyast2-2.14.8.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.ivQMez/_old 2006-10-09 17:53:25.000000000 +0200
+++ /var/tmp/diff_new_pack.ivQMez/_new 2006-10-09 17:53:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.14.7)
+# spec file for package autoyast2 (Version 2.14.8)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@

Name: autoyast2
URL: http://www.suse.de/~ug
-Version: 2.14.7
+Version: 2.14.8
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.14.7.tar.bz2
+Source0: autoyast2-2.14.8.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
Requires: yast2-core yast2-xml libxslt
@@ -49,7 +49,7 @@
Anas Nashif

%package installation
-Version: 2.14.7
+Version: 2.14.8
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -70,7 +70,7 @@
Anas Nashif

%package utils
-Version: 2.14.7
+Version: 2.14.8
Release: 1
Summary: YaST2 - Auto Installation Utilities
Group: System/YaST
@@ -87,7 +87,7 @@
Uwe Gansert <ug@xxxxxxx>

%prep
-%setup -n autoyast2-2.14.7
+%setup -n autoyast2-2.14.8

%build
%{prefix}/bin/y2tool y2autoconf
@@ -234,6 +234,13 @@
/usr/bin/create_update_source.sh

%changelog -n autoyast2
+* Mon Oct 09 2006 - ug@xxxxxxx
+- experimental imaging feature added
+- strict schema check in cloning and saving added
+- some schema updates
+- 2.14.8
+* Thu Sep 21 2006 - ug@xxxxxxx
+- fix in partition edit dialog (#206681)
* Wed Sep 20 2006 - ug@xxxxxxx
- 2.14.7
* Mon Sep 18 2006 - ug@xxxxxxx

++++++ autoyast2-2.14.7.tar.bz2 -> autoyast2-2.14.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/VERSION new/autoyast2-2.14.8/VERSION
--- old/autoyast2-2.14.7/VERSION 2006-09-20 11:21:58.000000000 +0200
+++ new/autoyast2-2.14.8/VERSION 2006-10-09 16:13:27.000000000 +0200
@@ -1 +1 @@
-2.14.7
+2.14.8
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/configure new/autoyast2-2.14.8/configure
--- old/autoyast2-2.14.7/configure 2006-09-20 11:22:32.000000000 +0200
+++ new/autoyast2-2.14.8/configure 2006-10-09 16:13:46.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for autoyast2 2.14.7.
+# Generated by GNU Autoconf 2.59 for autoyast2 2.14.8.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.14.7'
-PACKAGE_STRING='autoyast2 2.14.7'
+PACKAGE_VERSION='2.14.8'
+PACKAGE_STRING='autoyast2 2.14.8'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

ac_unique_file="RPMNAME"
@@ -728,7 +728,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.14.7 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.14.8 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -795,7 +795,7 @@

if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.14.7:";;
+ short | recursive ) echo "Configuration of autoyast2 2.14.8:";;
esac
cat <<\_ACEOF

@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.14.7
+autoyast2 configure 2.14.8
generated by GNU Autoconf 2.59

Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.14.7, which was
+It was created by autoyast2 $as_me 2.14.8, which was
generated by GNU Autoconf 2.59. Invocation command line was

$ $0 $@
@@ -1652,7 +1652,7 @@

# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.14.7'
+ VERSION='2.14.8'


cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@



-VERSION="2.14.7"
+VERSION="2.14.8"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug@xxxxxxx>"

@@ -2810,7 +2810,7 @@
} >&5
cat >&5 <<_CSEOF

-This file was extended by autoyast2 $as_me 2.14.7, which was
+This file was extended by autoyast2 $as_me 2.14.8, which was
generated by GNU Autoconf 2.59. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -2865,7 +2865,7 @@

cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-autoyast2 config.status 2.14.7
+autoyast2 config.status 2.14.8
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/configure.in new/autoyast2-2.14.8/configure.in
--- old/autoyast2-2.14.7/configure.in 2006-09-20 11:22:27.000000000 +0200
+++ new/autoyast2-2.14.8/configure.in 2006-10-09 16:13:41.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(autoyast2, 2.14.7, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.14.8, http://bugs.opensuse.org/, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])

@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs

dnl Important YaST2 variables
-VERSION="2.14.7"
+VERSION="2.14.8"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/clients/clone_system.ycp new/autoyast2-2.14.8/src/clients/clone_system.ycp
--- old/autoyast2-2.14.7/src/clients/clone_system.ycp 2005-12-14 17:15:56.000000000 +0100
+++ new/autoyast2-2.14.8/src/clients/clone_system.ycp 2006-10-09 15:11:22.000000000 +0200
@@ -23,6 +23,7 @@

AutoinstClone::additional = ProductControl::clone_modules;
AutoinstClone::Process();
+ Profile::checkProfile();
XML::YCPToXMLFile(`profile, Profile::current, "/root/autoinst.xml");
Popup::ClearFeedback();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/clients/inst_autoimage.ycp new/autoyast2-2.14.8/src/clients/inst_autoimage.ycp
--- old/autoyast2-2.14.7/src/clients/inst_autoimage.ycp 2005-02-08 18:27:10.000000000 +0100
+++ new/autoyast2-2.14.8/src/clients/inst_autoimage.ycp 2006-10-09 10:22:27.000000000 +0200
@@ -4,7 +4,7 @@
* Author: Anas Nashif <nashif@xxxxxxx>
* Summary: Imaging
*
- * $Id: inst_autoimage.ycp 19578 2004-09-24 01:05:45Z nashif $
+ * $Id: inst_autoimage.ycp 33269 2006-10-09 08:22:24Z ug $
*/

{
@@ -17,7 +17,7 @@
import "AutoinstImage";
import "AutoinstSoftware";

-if (!AutoinstImage::enabled)
+if (!AutoinstSoftware::imaging)
return `auto;


@@ -46,12 +46,15 @@
help_text );

Progress::NextStage();
-if (!AutoinstImage::Get(AutoinstSoftware::ft_module, Installation::destdir ))
-{
- Report::Error(_("Error while retrieving image."));
- return `abort;
-}

+//if (!AutoinstImage::Get(AutoinstSoftware::ft_module, Installation::destdir ))
+//{
+// Report::Error(_("Error while retrieving image."));
+// return `abort;
+//}
+
+AutoinstImage::getScript();
+AutoinstImage::runScript();

Progress::Finish();

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/data/dtd/host.dtd new/autoyast2-2.14.8/src/data/dtd/host.dtd
--- old/autoyast2-2.14.7/src/data/dtd/host.dtd 1970-01-01 01:00:00.000000000 +0100
+++ new/autoyast2-2.14.8/src/data/dtd/host.dtd 2006-09-25 09:53:05.000000000 +0200
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!ELEMENT host_address (#PCDATA)>
+<!ELEMENT host (hosts)>
+<!ELEMENT hosts (hosts_entry+)>
+<!ATTLIST hosts
+ config:type CDATA #FIXED "list"
+>
+<!ELEMENT hosts_entry (host_address,names)>
+<!ELEMENT names (name+)>
+<!ATTLIST names
+ config:type CDATA #FIXED "list"
+>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/data/dtd/networking.dtd new/autoyast2-2.14.8/src/data/dtd/networking.dtd
--- old/autoyast2-2.14.7/src/data/dtd/networking.dtd 2005-05-03 17:07:15.000000000 +0200
+++ new/autoyast2-2.14.8/src/data/dtd/networking.dtd 2006-09-25 09:53:05.000000000 +0200
@@ -37,6 +37,10 @@
<!ELEMENT usercontrol (#PCDATA)>
<!ELEMENT mtu (#PCDATA)>
<!ELEMENT ifplugd_priority (#PCDATA)>
+<!ELEMENT managed (#PCDATA)>
+<!ATTLIST managed
+ config:type CDATA #FIXED "boolean"
+>
<!ELEMENT module (#PCDATA)>
<!ELEMENT modules (module_entry+)>
<!ATTLIST modules
@@ -50,7 +54,7 @@
>
<!ELEMENT netmask (#PCDATA)>
<!ELEMENT network (#PCDATA)>
-<!ELEMENT networking (dhcp_options?, dns?, interfaces, modules?, routing?)>
+<!ELEMENT networking (dhcp_options?, dns?, interfaces, managed?, modules?, routing?)>

<!ELEMENT dhcp_options (dhclient_additional_options?, dhclient_client_id?, dhclient_hostname_option?)>
<!ELEMENT dhclient_additional_options (#PCDATA)>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/data/dtd/profile.dtd new/autoyast2-2.14.8/src/data/dtd/profile.dtd
--- old/autoyast2-2.14.7/src/data/dtd/profile.dtd 2005-05-03 17:07:15.000000000 +0200
+++ new/autoyast2-2.14.8/src/data/dtd/profile.dtd 2006-09-25 09:53:05.000000000 +0200
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!ENTITY % networking SYSTEM "networking.dtd">
+<!ENTITY % host SYSTEM "host.dtd">
<!ENTITY % nis SYSTEM "nis.dtd">
<!ENTITY % ldap_client SYSTEM "ldap_client.dtd">
<!ENTITY % nfs SYSTEM "nfs.dtd">
@@ -32,6 +33,7 @@
%security;
%partitioning;
%networking;
+%host;
%ldap_client;
%nis;
%nfs;
@@ -72,7 +74,7 @@


<!ENTITY % y2_all "files| firewall| groups|inetd| ldap| mail|
-networking| nfs| nfs_server| nis| nisplus| nis_server| ntp-client|
+networking| host| nfs| nfs_server| nis| nisplus| nis_server| ntp-client|
printer| proxy| runlevel| samba-client| samba-server|scripts| security| sound|
sysconfig| tftp-server | user_defaults| users| x11 | online_update|bootloader| classes| general| lvm| partitioning|partitioning_advanced| raid| report| software">
<!ELEMENT profile (%y2_all;)*>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/dialogs/dialogs.ycp new/autoyast2-2.14.8/src/dialogs/dialogs.ycp
--- old/autoyast2-2.14.7/src/dialogs/dialogs.ycp 2006-01-24 10:59:49.000000000 +0100
+++ new/autoyast2-2.14.8/src/dialogs/dialogs.ycp 2006-10-09 15:33:41.000000000 +0200
@@ -3,7 +3,7 @@
* Module: Auto-Installation Configuration System
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif <nashif@xxxxxxx>
- * $Id: dialogs.ycp 27274 2006-01-24 09:59:50Z ug $
+ * $Id: dialogs.ycp 33278 2006-10-09 13:33:39Z ug $
*/
{
textdomain "autoinst";
@@ -377,13 +377,15 @@
// some of these can be commented out for the release
list<list> validators = [
[
- _("Checking XML without DTD validation..."),
+ _("Checking XML without validation..."),
"/usr/bin/xmllint --noout",
],
+ /*
[
_("Checking XML with DTD validation..."),
"/usr/bin/xmllint --noout --valid"
],
+ */
[
_("Checking XML with RNG validation..."),
"/usr/bin/xmllint --noout --relaxng "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/dialogs/partition_dialogs.ycp new/autoyast2-2.14.8/src/dialogs/partition_dialogs.ycp
--- old/autoyast2-2.14.7/src/dialogs/partition_dialogs.ycp 2006-08-30 16:27:26.000000000 +0200
+++ new/autoyast2-2.14.8/src/dialogs/partition_dialogs.ycp 2006-09-21 12:00:21.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Anas Nashif <nashif@xxxxxxx>
*
- * $Id: partition_dialogs.ycp 32640 2006-08-30 14:29:00Z ug $
+ * $Id: partition_dialogs.ycp 33018 2006-09-21 10:01:58Z ug $
*/
{
textdomain "autoinst";
@@ -484,6 +484,8 @@
}
else
{
+ if( haskey( return_value, "size" ) )
+ return_value = remove( return_value, "size" );
string partitionSize = (string) UI::QueryWidget(`id(`partsize), `Value);
string partitionNr = (string) UI::QueryWidget(`id(`partition_nr), `Value);
if ( partitionSize == "" && partitionNr == "" && !(boolean)UI::QueryWidget(`id(`reuse), `Value) )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/include/conftree.ycp new/autoyast2-2.14.8/src/include/conftree.ycp
--- old/autoyast2-2.14.7/src/include/conftree.ycp 2005-08-18 11:50:27.000000000 +0200
+++ new/autoyast2-2.14.8/src/include/conftree.ycp 2006-10-09 15:33:41.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: conftree.ycp 25037 2005-08-18 09:50:26Z ug $
+ * $Id: conftree.ycp 33278 2006-10-09 13:33:39Z ug $
*/
{

@@ -29,6 +29,7 @@
if ( Profile::Save( AutoinstConfig::currentFile ))
{
Popup::Message(sformat(_("File %1 was saved successfully."), AutoinstConfig::currentFile));
+ Profile::checkProfile();
Profile::changed=false;
list pathComponents = splitstring( (string)filename, "/");
integer s = size(pathComponents) - 1;
@@ -524,6 +525,7 @@
if ( Profile::Save( AutoinstConfig::currentFile ))
{
Popup::Message(sformat(_("File %1 was saved successfully."), AutoinstConfig::currentFile));
+ Profile::checkProfile();
Profile::changed = false;
}
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/modules/AutoinstImage.ycp new/autoyast2-2.14.8/src/modules/AutoinstImage.ycp
--- old/autoyast2-2.14.7/src/modules/AutoinstImage.ycp 2006-01-24 15:18:14.000000000 +0100
+++ new/autoyast2-2.14.8/src/modules/AutoinstImage.ycp 2006-10-09 10:22:27.000000000 +0200
@@ -2,9 +2,9 @@
* File: modules/AutoinstImage.ycp
* Package: Auto-installation
* Summary: Process Auto-Installation Images
- * Author: Anas Nashif <nashif@xxxxxxx>
+ * Author: Uwe Gansert <uwe.gansert@xxxxxxx>
*
- * $Id: AutoinstImage.ycp 21875 2005-02-23 14:51:50Z nashif $
+ * $Id: AutoinstImage.ycp 33269 2006-10-09 08:22:24Z ug $
*/
{

@@ -12,132 +12,32 @@
textdomain "autoinst";

import "Progress";
-
-
- global boolean enabled = false;
-
-
- /*
- * Port number where the Flamethrower configuration database can be
- * found on the Flamethrower server. (this is a udp-sender portbase
- * entry)
- */
- string flamethrower_directory_portbase = "9000";
-
- string tar_opts = "--overwrite -xp";
-
- string udp_receiver_options = "";
-
-
- string tmpname(string base, string tmpdir)
- {
- map bash = (map)SCR::Execute (.target.bash_output, "mktemp -t " + base + ".XXXXXXXXXX || exit 1 ", $["TMPDIR":tmpdir]);
- string ret = bash["stdout"]:"";
- ret = splitstring(ret,"\n")[0]:"";
- SCR::Execute(.target.remove, ret);
- return (ret);
- }
-
- global define boolean Client(
- string interface,
- string portbase,
- string ttl,
- boolean nosync,
- boolean async,
- string mcast_all_addr,
- string dir,
- string mod,
- string tmp
-
- ) {
- if (interface == "" || portbase == "")
- return false;
- udp_receiver_options = "--interface " + interface;
- udp_receiver_options = udp_receiver_options + " --portbase " + portbase;
- if (ttl!="")
- udp_receiver_options = udp_receiver_options + " --ttl " + ttl;
- if (nosync)
- udp_receiver_options = udp_receiver_options + " --nosync";
-
- if (async)
- udp_receiver_options = udp_receiver_options + " --async";
-
- if (mcast_all_addr!= "")
- udp_receiver_options = udp_receiver_options + " --mcast-all-addr " + mcast_all_addr;
-
- string tarid = tmpname("multicast.tar", tmp);
- string udp_cmd = sformat("udp-receiver %1 --file %2 2>/dev/null",
- udp_receiver_options, tarid);
- string tar_cmd = sformat("tar %1 -C %2 -f %3", tar_opts, dir, tarid);
- y2debug("udp_cmd: %1", udp_cmd );
- y2debug("tar_cmd: %1", tar_cmd );
- if ((integer)SCR::Execute(.target.bash, udp_cmd)!= 0 )
- return false;
- if (UI::WidgetExists (`id (`pb)) && mod != "flamethrower_directory")
- Progress::NextStage();
- if ((integer)SCR::Execute(.target.bash, tar_cmd)!= 0 )
- return false;
-
- SCR::Execute(.target.remove, tarid);
- return true;
-
- }
-
-
-
- global define list ListModules () {
-
- string tmp = (string)SCR::Read(.target.tmpdir);
- string dir = tmpname("flamethrower", tmp);
- SCR::Execute(.target.mkdir, dir );
- boolean ret = Client("eth0", flamethrower_directory_portbase, "", false, false, "", dir, "flamethrower_directory", tmp);
- if (!ret)
- {
- y2error("Error running client");
- return ([]);
+ import "AutoinstConfig";
+ import "URL";
+ import "AutoinstSoftware";
+
+ include "autoinstall/io.ycp";
+
+ global define boolean getScript() {
+ boolean ret = false;
+ if( AutoinstSoftware::image["script_location"]:"" != "" ) {
+ map urltok = $[];
+
+ urltok = URL::Parse (AutoinstSoftware::image["script_location"]:"");
+ string scheme = urltok["scheme"]:"default";
+ string host = urltok["host"]:"";
+ string filepath = urltok["path"]:"";
+ ret = Get(scheme,host,filepath, AutoinstConfig::scripts_dir+"/image.sh");
+
+ } else if( AutoinstSoftware::image["script_source"]:"" != "" ) {
+ SCR::Write(.target.string, AutoinstConfig::scripts_dir+"/image.sh", AutoinstSoftware::image["script_source"]:"");
+ ret = true;
}
- list<string> dir_contents = (list<string>)SCR::Read(.target.dir, dir);
- dir_contents=filter(string m, dir_contents, ``(m!="" && m!="." && m!=".." && m!="flamethrower_directory"));
- return dir_contents;
- }
-
-
-
- global define boolean Get (string Module, string targetdir) {
- string portbase = flamethrower_directory_portbase;
- boolean async = false;
- string mcast_all_addr = "";
- string ttl = "";
- string expected_size = "0";
-
-
- string tmp = (string)SCR::Read(.target.tmpdir);
- string dir = tmpname("flamethrower", tmp);
- SCR::Execute(.target.mkdir, dir );
- boolean ret = Client("eth0", flamethrower_directory_portbase, "", false, false, "", dir, "flamethrower_directory", tmp);
- if (!ret)
- return ret;
- string module_contents = (string)SCR::Read(.target.string, dir + "/" + Module );
- list<string> lines = splitstring(module_contents, "\n");
- foreach(string l , lines, ``{
- list<string> keyval = splitstring(l, "=");
- if (keyval[0]:"" == "PORTBASE")
- portbase = keyval[1]:"";
- else if (keyval[0]:"" == "ASYNC" && keyval[1]:"" == "on")
- async = true;
- else if (keyval[0]:"" == "TTL")
- ttl = keyval[1]:"";
- else if (keyval[0]:"" == "MCAST_ALL_ADDR")
- mcast_all_addr = keyval[1]:"";
- else if (keyval[0]:"" == "SIZE")
- expected_size = keyval[1]:"";
- });
-
- if (SCR::Read(.target.dir, targetdir) == nil )
- SCR::Execute(.target.bash, "mkdir -p " + targetdir );
-
- ret = Client("eth0", portbase, ttl, false, async, mcast_all_addr, targetdir, Module, targetdir);
return ret;
+ }

+ global define boolean runScript() {
+ SCR::Execute(.target.bash, "/bin/sh /tmp/image.sh" );
+ return true;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/modules/AutoinstSoftware.ycp new/autoyast2-2.14.8/src/modules/AutoinstSoftware.ycp
--- old/autoyast2-2.14.7/src/modules/AutoinstSoftware.ycp 2006-07-07 11:31:21.000000000 +0200
+++ new/autoyast2-2.14.8/src/modules/AutoinstSoftware.ycp 2006-10-09 10:22:27.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Software
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: AutoinstSoftware.ycp 31748 2006-07-07 09:32:53Z ug $
+ * $Id: AutoinstSoftware.ycp 33269 2006-10-09 08:22:24Z ug $
*
*/
{
@@ -21,7 +21,6 @@
import "Kernel";
import "AutoinstConfig";
import "ProductControl";
- import "AutoinstImage";
import "Storage";
import "Mode";

@@ -29,6 +28,8 @@

global map Software = $[];

+ global map<string, any> image = $[];
+
// Base selection
global string base = "";

@@ -45,7 +46,7 @@
global string ft_module = "";

/* Enable Imaging */
- boolean imaging = false;
+ global boolean imaging = false;

/* default value of settings modified */
global boolean modified = false;
@@ -101,6 +102,7 @@
PackageAI::toremove = settings["remove-packages"]:[];

/* Imaging */
+ /*
map<string, any> image = settings["system_images"]:$[];
imaging = image["enable_multicast_images"]:false;
ft_module = image["module_name"]:"";
@@ -108,6 +110,10 @@
modified = false;
else
modified = true;
+ */
+ image = settings["image"]:$[];
+ if( size(image) > 0 )
+ imaging=true;

return true;
}
@@ -360,13 +366,10 @@

if (imaging)
{
- if (ft_module!="")
- {
+ if( ! image["run_kickoff"]:false )
ProductControl::DisabledModules=add(ProductControl::DisabledModules, "kickoff");
- ProductControl::DisabledModules=add(ProductControl::DisabledModules, "rpmcopy");
- AutoinstImage::enabled = true;
- return true;
- }
+ ProductControl::DisabledModules=add(ProductControl::DisabledModules, "rpmcopy");
+ return true;
}

boolean ok = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.7/src/modules/Profile.ycp new/autoyast2-2.14.8/src/modules/Profile.ycp
--- old/autoyast2-2.14.7/src/modules/Profile.ycp 2006-09-18 14:59:41.000000000 +0200
+++ new/autoyast2-2.14.8/src/modules/Profile.ycp 2006-10-09 15:33:41.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Profile handling
* Authors: Anas Nashif <nashif@xxxxxxx>
*
- * $Id: Profile.ycp 32929 2006-09-18 13:01:18Z ug $
+ * $Id: Profile.ycp 33278 2006-10-09 13:33:39Z ug $
*/
{
module "Profile";
@@ -16,6 +16,7 @@
import "XML";
import "Popup";
import "ProductControl";
+ import "Directory";

include "autoinstall/xml.ycp";

@@ -623,4 +624,48 @@
m = setMValue( l, v, m );
return m;
}
+
+ global void checkProfile() {
+ string file = AutoinstConfig::tmpDir + "/" + "valid.xml";
+ Save(file);
+ string summary = "Some schema check failed!\nPlease attach your logfile to bug id 211014\n\n";
+ boolean valid = false;
+
+ list<list> validators = [
+ [
+ _("Checking XML with RNG validation..."),
+ "/usr/bin/xmllint --noout --relaxng "
+ + Directory::schemadir + "/autoyast/rng/profile.rng",
+ ]
+ ];
+
+ if (Mode::config () ) {
+ validators = add( validators, [
+ _("Checking XML with RNC validation..."),
+ "/usr/bin/jing >&2 -c "
+ + Directory::schemadir + "/autoyast/rnc/profile.rnc",
+ ] );
+ }
+
+ foreach (list i, validators, {
+ string header = i[0]:"";
+ string cmd = i[1]:"" + " " + file;
+
+ summary = summary + header + "\n";
+
+ map o = (map)SCR::Execute (.target.bash_output, cmd);
+ y2debug("validation output: %1", o);
+
+ summary = summary + cmd + "\n";
+ summary = summary + o["stderr"]:"" + "\n";
+ summary = summary + "\n";
+ if( o["exit"]:1 != 0 )
+ valid = false;
+ });
+ if( ! valid ) {
+ Popup::Error(summary);
+ y2milestone("Profile check failed please attach the log to bug id 211014: %1",summary);
+ }
+ }
+
}


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >