Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at Wed Jul 8 23:05:09 CEST 2009.
--------
--- autoyast2/autoyast2.changes 2009-06-17 16:54:26.000000000 +0200
+++ autoyast2/autoyast2.changes 2009-07-08 11:28:29.000000000 +0200
@@ -1,0 +2,36 @@
+Tue Jul 7 15:30:01 CEST 2009 - ug@suse.de
+
+- deactivate <timeout> after first user interaction
+- 2.18.7
+
+-------------------------------------------------------------------
+Mon Jul 6 15:17:26 CEST 2009 - ug@suse.de
+
+- timout for <ask> dialogs invented
+
+-------------------------------------------------------------------
+Thu Jul 2 12:39:47 CEST 2009 - ug@suse.de
+
+- fixed order of groups in UI
+
+-------------------------------------------------------------------
+Wed Jul 1 11:19:42 CEST 2009 - ug@suse.de
+
+- for scripts invented
+
+-------------------------------------------------------------------
+Tue Jun 30 11:35:23 CEST 2009 - ug@suse.de
+
+- <filename> option added to the <pxe> section
+
+-------------------------------------------------------------------
+Mon Jun 29 13:34:11 CEST 2009 - ug@suse.de
+
+- <pxe> schema file added
+
+-------------------------------------------------------------------
+Fri Jun 26 12:22:51 CEST 2009 - ug@suse.de
+
+- UI for LVm striping added
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
autoyast2-2.18.6.tar.bz2
New:
----
autoyast2-2.18.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.zZsjFt/_old 2009-07-08 23:04:28.000000000 +0200
+++ /var/tmp/diff_new_pack.zZsjFt/_new 2009-07-08 23:04:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.18.6)
+# spec file for package autoyast2 (Version 2.18.7)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,16 +17,15 @@
# norootforbuild
-Url: http://www.suse.de/~ug
Name: autoyast2
-Version: 2.18.6
+Version: 2.18.7
Release: 1
-License: GPL v2 or later
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.18.6.tar.bz2
+Source0: autoyast2-2.18.7.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later
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-slp yast2-testsuite yast2-transfer
# API for Disabled Modules (ProductControl)
BuildRequires: yast2 >= 2.16.36
@@ -54,16 +53,9 @@
This file contains YaST2-independent files needed to create
installation sources.
-
-
-Authors:
---------
- Uwe Gansert
- Anas Nashif
-
%package installation
License: GPL v2 or later
-Version: 2.18.6
+Version: 2.18.7
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -79,15 +71,8 @@
This package performs auto-installation relying on a control file
generated with the autoyast2 package.
-
-
-Authors:
---------
- Uwe Gansert
- Anas Nashif
-
%prep
-%setup -n autoyast2-2.18.6
+%setup -n autoyast2-2.18.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -97,7 +82,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
[ -n "$JAVA_HOME" ] && unset JAVA_HOME
. /usr/share/java-utils/java-functions
export JAVA_HOME
++++++ autoyast2-2.18.6.tar.bz2 -> autoyast2-2.18.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/Makefile.am new/autoyast2-2.18.7/Makefile.am
--- old/autoyast2-2.18.6/Makefile.am 2009-06-17 16:48:38.000000000 +0200
+++ new/autoyast2-2.18.7/Makefile.am 2009-07-08 11:25:23.000000000 +0200
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/Makefile.in new/autoyast2-2.18.7/Makefile.in
--- old/autoyast2-2.18.6/Makefile.in 2009-06-17 16:48:47.000000000 +0200
+++ new/autoyast2-2.18.7/Makefile.in 2009-07-08 11:25:27.000000000 +0200
@@ -232,10 +232,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
CLEANFILES =
MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
POT_DST = $(shell find -type d -name testsuite -prune , \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/VERSION new/autoyast2-2.18.7/VERSION
--- old/autoyast2-2.18.6/VERSION 2009-06-17 16:48:34.000000000 +0200
+++ new/autoyast2-2.18.7/VERSION 2009-07-08 11:24:57.000000000 +0200
@@ -1 +1 @@
-2.18.6
+2.18.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/autodocs-ycp.ami new/autoyast2-2.18.7/autodocs-ycp.ami
--- old/autoyast2-2.18.6/autodocs-ycp.ami 2009-06-17 16:48:38.000000000 +0200
+++ new/autoyast2-2.18.7/autodocs-ycp.ami 2009-07-08 11:25:23.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -8,20 +8,25 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/configure new/autoyast2-2.18.7/configure
--- old/autoyast2-2.18.6/configure 2009-06-17 16:48:44.000000000 +0200
+++ new/autoyast2-2.18.7/configure 2009-07-08 11:25:25.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for autoyast2 2.18.6.
+# Generated by GNU Autoconf 2.63 for autoyast2 2.18.7.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.18.6'
-PACKAGE_STRING='autoyast2 2.18.6'
+PACKAGE_VERSION='2.18.7'
+PACKAGE_STRING='autoyast2 2.18.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1282,7 +1282,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.18.6 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.18.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1353,7 +1353,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.18.6:";;
+ short | recursive ) echo "Configuration of autoyast2 2.18.7:";;
esac
cat <<\_ACEOF
@@ -1433,7 +1433,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.18.6
+autoyast2 configure 2.18.7
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1447,7 +1447,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.18.6, which was
+It was created by autoyast2 $as_me 2.18.7, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2294,7 +2294,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.18.6'
+ VERSION='2.18.7'
cat >>confdefs.h <<_ACEOF
@@ -2518,7 +2518,7 @@
-VERSION="2.18.6"
+VERSION="2.18.7"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
@@ -3577,7 +3577,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.18.6, which was
+This file was extended by autoyast2 $as_me 2.18.7, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3627,7 +3627,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-autoyast2 config.status 2.18.6
+autoyast2 config.status 2.18.7
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/configure.in new/autoyast2-2.18.7/configure.in
--- old/autoyast2-2.18.6/configure.in 2009-06-17 16:48:38.000000000 +0200
+++ new/autoyast2-2.18.7/configure.in 2009-07-08 11:25:23.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for autoyast2
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.18.6, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.18.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.18.6"
+VERSION="2.18.7"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/doc/CreateProfileDetails.xml new/autoyast2-2.18.7/doc/CreateProfileDetails.xml
--- old/autoyast2-2.18.6/doc/CreateProfileDetails.xml 2009-06-04 14:45:29.000000000 +0200
+++ new/autoyast2-2.18.7/doc/CreateProfileDetails.xml 2009-07-07 15:48:58.000000000 +0200
@@ -2174,6 +2174,12 @@
<entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
+ <entry>feedback_type</entry>
+ <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
+ <para><screen><feedback_type>warning</feedback_type></screen></para></entry>
+ <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry>
+ </row>
+ <row>
<entry>debug</entry>
<entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
turned on.
@@ -2250,6 +2256,12 @@
<entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
+ <entry>feedback_type</entry>
+ <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
+ <para><screen><feedback_type>warning</feedback_type></screen></para></entry>
+ <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry>
+ </row>
+ <row>
<entry>debug</entry>
<entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
turned on.
@@ -2335,6 +2347,12 @@
<entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
+ <entry>feedback_type</entry>
+ <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
+ <para><screen><feedback_type>warning</feedback_type></screen></para></entry>
+ <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry>
+ </row>
+ <row>
<entry>debug</entry>
<entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
turned on.
@@ -2421,6 +2439,12 @@
<entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
+ <entry>feedback_type</entry>
+ <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
+ <para><screen><feedback_type>warning</feedback_type></screen></para></entry>
+ <entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry>
+ </row>
+ <row>
<entry>debug</entry>
<entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
turned on.
@@ -3379,6 +3403,12 @@
<para><screen><back_label>change values</back_label></screen></para></entry>
<entry>optional</entry>
</row>
+ <row>
+ <entry>timeout (available in openSUSE 11.2 (not SLES11)</entry>
+ <entry>You can specify an integer here that is used as timeout in seconds. If the user does not answer the question before the timeout, the default value is taken as answer. When the user touches/changes any widget in the dialog, the timeout is turned off and the dialog has to be confirmed by the ok-button.
+ <para><screen><timeout config:type="integer">30</timeout></screen></para></entry>
+ <entry>optional. A missing value is interpreted as 0 which means that there is no timeout</entry>
+ </row>
</tbody>
</tgroup>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/doc/Installation.xml new/autoyast2-2.18.7/doc/Installation.xml
--- old/autoyast2-2.18.6/doc/Installation.xml 2009-06-17 14:51:35.000000000 +0200
+++ new/autoyast2-2.18.7/doc/Installation.xml 2009-06-30 11:34:46.000000000 +0200
@@ -199,6 +199,7 @@
</pxelinux-config>
<tftp-server>192.168.66.1</tftp-server>
<pxelinux-dir>/pxelinux.cfg</pxelinux-dir>
+ <filename>__MAC__</filename> <!-- since openSUSE 11.2, not SLES11 -->
</pxe>
]]>
</screen>
@@ -216,6 +217,11 @@
reboot and if you want to do another autoinstallation for that machine, you have to
remove the file from the TFTP server.
</para>
+ <para>
+ Since openSUSE 11.2 (not SLES11) you can configure the filename too that will be uploaded.
+ If you use the "magic" __MAC__ filename, the filename will be the mac address of your machine like this "01-08-00-27-79-49-ee".
+ A missing filename creates the IP address filename like in the past.
+ </para>
</section>
</section>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/doc/autodocs/Makefile.in new/autoyast2-2.18.7/doc/autodocs/Makefile.in
--- old/autoyast2-2.18.6/doc/autodocs/Makefile.in 2009-06-17 16:48:45.000000000 +0200
+++ new/autoyast2-2.18.7/doc/autodocs/Makefile.in 2009-07-08 11:25:26.000000000 +0200
@@ -19,7 +19,7 @@
#
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -28,6 +28,10 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -150,7 +154,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
imagedir = @imagedir@
includedir = @includedir@
infodir = @infodir@
@@ -192,7 +196,7 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
AUTODOCS_YCP = $(top_srcdir)/src/*/*.ycp
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
all: all-am
@@ -378,14 +382,15 @@
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/src/dialogs/PartitionDialog.ycp new/autoyast2-2.18.7/src/dialogs/PartitionDialog.ycp
--- old/autoyast2-2.18.6/src/dialogs/PartitionDialog.ycp 2008-10-01 16:00:13.000000000 +0200
+++ new/autoyast2-2.18.7/src/dialogs/PartitionDialog.ycp 2009-06-26 12:40:31.000000000 +0200
@@ -27,6 +27,7 @@
define DriveT parentDrive = $[];
define integer driveId = 0;
define integer partitionIdx = 0;
+ define boolean dirty = false;
define list<string>
getAvailableMountPoints(){
@@ -84,7 +85,7 @@
}
define list<term>
getVolgroups(){
- return add( toItemList( AutoinstPartPlan::getAvailableVolgroups() ), `item(`id(`none),"<none>") );
+ return add( toItemList( AutoinstPartPlan::getAvailableVolgroups() ), `item(`id(`none),_("<none>")) );
}
define void enableMount(){
UI::ChangeWidget(`id(`cbMountPoint), `Enabled, true );
@@ -108,6 +109,8 @@
string mpString = "";
string lvName = "";
string lvmGroup = "";
+ integer stripes = 1;
+ integer stripesize = 0;
integer partId = 131;
any mpAny = UI::QueryWidget(`id(`cbMountPoint),`Value);
@@ -120,11 +123,13 @@
if( isOnVolgroup() ){
/* LV */
lvName = (string) UI::QueryWidget( `id(`lvName), `Value );
- if( "" == lvName ){
+ stripes = (integer) UI::QueryWidget( `id(`numberStripes), `Value );
+ stripesize = (integer) UI::QueryWidget( `id(`stripesize), `Value );
+ if( "" == lvName ) {
Popup::Warning( _("Please provide a logical volume name.") );
}
- }
- else{
+ } else {
+ UI::ChangeWidget( `id(`striping), `Enabled, false );
if( (symbol) UI::QueryWidget(`id(`cbVolgroup), `Value) != `none ){
/* PV */
/* `/dev/system1 -> "system1" */
@@ -141,6 +146,13 @@
part = AutoinstPartition::set( part, "mount",mpString);
part = AutoinstPartition::set( part, "lvm_group",lvmGroup);
part = AutoinstPartition::set( part, "lv_name",lvName);
+ if( stripes > 1 && stripesize > 0 && (boolean)UI::QueryWidget(`id(`striping), `Value) ) {
+ part = AutoinstPartition::set( part, "stripes", stripes );
+ part = AutoinstPartition::set( part, "stripesize", stripesize );
+ } else {
+ part = remove( part, "stripes" );
+ part = remove( part, "stripesize" );
+ }
string unit = symbol2string((symbol)UI::QueryWidget(`id(`unit), `Value));
string sizeVal = "";
@@ -201,7 +213,25 @@
lvName = AutoinstPartition::getLVNameFor( mountPoint );
}
UI::ChangeWidget(`id(`lvName), `Value, lvName);
- }
+ UI::ChangeWidget(`id(`stripesize), `Value, currentPartition["stripesize"]:0 );
+ UI::ChangeWidget(`id(`numberStripes), `Value, currentPartition["stripes"]:1 );
+ if( currentPartition["stripes"]:1 > 1 ) {
+ UI::ChangeWidget(`id(`striping), `Enabled, true );
+ UI::ChangeWidget(`id(`striping), `Value, true );
+ UI::ChangeWidget(`id(`numberStripes), `Enabled, true );
+ UI::ChangeWidget(`id(`stripesize), `Enabled, true );
+ } else {
+ UI::ChangeWidget(`id(`striping), `Enabled, true );
+ UI::ChangeWidget(`id(`striping), `Value, false );
+ UI::ChangeWidget(`id(`numberStripes), `Enabled, false );
+ UI::ChangeWidget(`id(`stripesize), `Enabled, false );
+ }
+ } else {
+ UI::ChangeWidget(`id(`striping), `Value, false );
+ UI::ChangeWidget(`id(`striping), `Enabled, false );
+ UI::ChangeWidget(`id(`numberStripes), `Enabled, false );
+ UI::ChangeWidget(`id(`stripesize), `Enabled, false );
+ }
UI::ChangeWidget(`id(`cbMountPoint), `Value, mountPoint );
}
if( 0 == size( getVolgroups() ) ){
@@ -310,8 +340,9 @@
currentPartition, driveId,partitionIdx);
PartitionT storedPartition = PartitionLoad( driveId, partitionIdx );
- if( ! AutoinstPartition::areEqual( currentPartition, storedPartition ) ){
+ if( ! AutoinstPartition::areEqual( currentPartition, storedPartition ) || dirty ){
if( Popup::YesNo( _("Store unsaved changes to partition?") ) ){
+ dirty = false;
if( PartitionCheckSanity( currentPartition ) ){
AutoinstPartPlan::updatePartition(driveId, partitionIdx, currentPartition );
}
@@ -364,7 +395,13 @@
`Left(`CheckBox(`id(`resizePartition),`opt(`notify),_("Res&ize existing partition")))
) /* VBox */
),/* HBox */
- `VSpacing(1),
+ `VSpacing(1),
+ `HBox( `CheckBox(`id(`striping), `opt(`notify), _("Activate Striping") ),
+ `IntField(`id(`numberStripes),`opt(`notify),_("Number of Stripes"),1,9,1),
+ `IntField(`id(`stripesize), `opt(`notify),_("Stripe size"),1,32,1),
+ `HStretch()
+ ), /* HBox */
+ `VSpacing(1),
`PushButton(`id(`advanced), _("Advan&ced")),
`VSpacing(2),
`PushButton( `id(`apply),_("Apply"))
@@ -374,7 +411,10 @@
UI::ReplaceWidget(`id(replacement_point), contents );
/* only numbers are allowed in size */
UI::ChangeWidget(`id(`size), `ValidChars, "0123456789" );
- updatePartitionDialogGUI();
+ UI::ChangeWidget(`id(`striping), `Enabled, isOnVolgroup() );
+ UI::ChangeWidget(`id(`numberStripes), `Enabled, (boolean)UI::QueryWidget( `id(`striping), `Value) );
+ UI::ChangeWidget(`id(`stripesize), `Enabled, (boolean)UI::QueryWidget( `id(`striping), `Value) );
+ updatePartitionDialogGUI();
}
define void PartitionNew(){
@@ -504,6 +544,12 @@
UI::ChangeWidget(`id(`cbFileSystem), `Enabled, false );
}
}
+ else if( event == `striping ) {
+ UI::ChangeWidget(`id(`numberStripes), `Value, 1 );
+ UI::ChangeWidget(`id(`numberStripes), `Enabled, (boolean)UI::QueryWidget( `id(`striping), `Value) );
+ UI::ChangeWidget(`id(`stripesize), `Enabled, (boolean)UI::QueryWidget( `id(`striping), `Value) );
+ dirty = true;
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/src/dialogs/ask.ycp new/autoyast2-2.18.7/src/dialogs/ask.ycp
--- old/autoyast2-2.18.6/src/dialogs/ask.ycp 2009-05-04 14:29:04.000000000 +0200
+++ new/autoyast2-2.18.7/src/dialogs/ask.ycp 2009-07-07 15:30:35.000000000 +0200
@@ -5,7 +5,7 @@
* Summary: ask for some values in the profile
*
* Changes:
- * $Id: ask.ycp 57028 2009-04-29 10:58:09Z lslezak $
+ * $Id: ask.ycp 57907 2009-07-07 13:30:34Z ug $
*/
{
@@ -73,6 +73,7 @@
term help_term = `Empty();
term title_term = `Empty();
integer element_cnt = 0;
+ integer timeout = 0;
history = add( history, dialog_nr );
foreach( map ask, (list<map>)dialogs[dialog_nr]:[], ``{
string pathStr = ask["path"]:"";
@@ -86,15 +87,16 @@
title = ask["title"]:"";
back_label = ask["back_label"]:back_label;
ok_label = ask["ok_label"]:ok_label;
+ timeout = ask["timeout"]:0;
mod = true;
term dlg = `Dummy();
if( type == "boolean" ) {
boolean on=(ask["default"]:nil=="true")?(true):(false);
if( frametitle != "" ) {
- dlg = `Left( `Frame ( frametitle, `CheckBox(`id(entry_id), question,on ) ) );
+ dlg = `Left( `Frame ( frametitle, `CheckBox(`id(entry_id), `opt(`notify), question,on ) ) );
} else {
- dlg = `Left( `CheckBox(`id(entry_id), question,on ) );
+ dlg = `Left( `CheckBox(`id(entry_id), `opt(`notify), question,on ) );
}
} else if( type == "symbol" ) {
list<any> dummy = [];
@@ -103,9 +105,9 @@
dummy = add( dummy, `item(`id(e["value"]:`none), e["label"]:"",on) );
});
if( frametitle != "" ) {
- dlg = `Left( `Frame ( frametitle, `ComboBox( `id(entry_id), question, dummy ) ) );
+ dlg = `Left( `Frame ( frametitle, `ComboBox( `id(entry_id), `opt(`notify), question, dummy ) ) );
} else {
- dlg = `Left( `ComboBox( `id(entry_id), question, dummy ) );
+ dlg = `Left( `ComboBox( `id(entry_id), `opt(`notify), question, dummy ) );
}
} else if( type == "static_text" ) {
if( frametitle != "" ) {
@@ -117,13 +119,13 @@
if( ask["password"]:false == true ) {
if( frametitle != "" ) {
dlg = `Left( `Frame ( frametitle, `VBox(
- `Password(`id(entry_id), question),
- `Password(`id(`pass2), "")
+ `Password(`id(entry_id), `opt(`notify), question, ask["default"]:"" ),
+ `Password(`id(`pass2), `opt(`notify), "", ask["default"]:"" )
) ) );
} else {
dlg = `Left( `VBox(
- `Password(`id(entry_id), question),
- `Password(`id(`pass2), "")
+ `Password(`id(entry_id), `opt(`notify), question, ask["default"]:"" ),
+ `Password(`id(`pass2), `opt(`notify), "", ask["default"]:"" )
) );
}
} else {
@@ -134,15 +136,15 @@
dummy = add( dummy, `item(`id(e["value"]:""), e["label"]:"",on) );
});
if( frametitle != "" ) {
- dlg = `Left( `Frame ( frametitle, `ComboBox( `id(entry_id), question, dummy ) ) );
+ dlg = `Left( `Frame ( frametitle, `ComboBox( `id(entry_id), `opt(`notify), question, dummy ) ) );
} else {
- dlg = `Left( `ComboBox( `id(entry_id), question, dummy ) );
+ dlg = `Left( `ComboBox( `id(entry_id), `opt(`notify), question, dummy ) );
}
} else {
if( frametitle != "" ) {
- dlg = `Left( `Frame ( frametitle, `TextEntry(`id(entry_id), question, ask["default"]:"" ) ) );
+ dlg = `Left( `Frame ( frametitle, `TextEntry(`id(entry_id), `opt(`notify), question, ask["default"]:"" ) ) );
} else {
- dlg = `Left( `TextEntry(`id(entry_id), question, ask["default"]:"" ) );
+ dlg = `Left( `TextEntry(`id(entry_id), `opt(`notify), question, ask["default"]:"" ) );
}
}
}
@@ -183,8 +185,13 @@
if( size(history) < 2 )
UI::ChangeWidget(`id(`back) , `Enabled, false);
while (true) {
- any ret = UI::UserInput();
- if( ret == `ok ) {
+ any ret = nil;
+ if( timeout == 0 )
+ ret = UI::UserInput();
+ else
+ ret = UI::TimeoutUserInput( timeout * 1000 );
+ timeout = 0;
+ if( ret == `ok || ret == `timeout ) {
integer runAgain = 0;
integer element_cnt = 0;
dialogs[dialog_nr] = maplist( map ask, (list<map>)dialogs[dialog_nr]:[], ``{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/src/dialogs/script_dialogs.ycp new/autoyast2-2.18.7/src/dialogs/script_dialogs.ycp
--- old/autoyast2-2.18.6/src/dialogs/script_dialogs.ycp 2008-02-18 12:17:23.000000000 +0100
+++ new/autoyast2-2.18.7/src/dialogs/script_dialogs.ycp 2009-07-01 13:50:20.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Anas Nashif
*
- * $Id: script_dialogs.ycp 44396 2008-02-12 15:52:28Z msvec $
+ * $Id: script_dialogs.ycp 57819 2009-07-01 11:50:19Z ug $
*/
{
@@ -163,13 +163,23 @@
),
`HBox(
// a checkbox where you can choose if you want to see script-feedback output or not
- `CheckBox( `id( `feedback ), _("&Feedback"), ( script["feedback"]:false ) ),
+ `CheckBox( `id( `feedback ), `opt(`notify), _("&Feedback"), ( script["feedback"]:false ) ),
// a checkbox where you can choose if you want to see script-debug output or not
`CheckBox( `id( `debug ), _("&Debug"), ( script["debug"]:true ) ),
`CheckBox( `id( `chrooted ), _("&Chrooted"), ( script["chrooted"]:false ) ),
// a checkbox where you can choose if you need to have network when the script is running
`CheckBox( `id( `network ), _("&Network"), ( script["network_needed"]:false ) )
),
+ `HBox(
+ // a checkbox where you can choose if you want to see script-feedback output or not
+ `ComboBox( `id( `feedback_type ), _("&Feedback Type"),
+ [ `item(`id(""), _("none"), (script["feedback_type"]:"" == "")),
+ `item(`id("message"), _("Message"), (script["feedback_type"]:"" == "message")),
+ `item(`id("warning"), _("Warning"), (script["feedback_type"]:"" == "warning")),
+ `item(`id("error") , _("Error"), (script["feedback_type"]:"" == "error"))
+ ]
+ )
+ ),
`VSpacing(1),
`HBox(
`MultiLineEdit(`id(`source), _("S&cript Source"), script["source"]:"")
@@ -202,6 +212,9 @@
UI::ChangeWidget (`id(`feedback), `Enabled, false);
}
+ if( !(boolean)UI::QueryWidget( `id(`feedback), `Value ) )
+ UI::ChangeWidget (`id(`feedback_type), `Enabled, false );
+
if (mode == `edit)
{
UI::ChangeWidget(`id(`filename), `Enabled, false);
@@ -217,6 +230,7 @@
string interpreter = (string)UI::QueryWidget(`id(`interpreter), `Value);
string source = (string)UI::QueryWidget(`id(`source), `Value);
boolean feedback = (boolean)UI::QueryWidget(`id(`feedback), `Value);
+ string feedback_type = (string)UI::QueryWidget(`id(`feedback_type), `Value);
boolean debug = (boolean)UI::QueryWidget(`id(`debug), `Value);
boolean chrooted = (boolean)UI::QueryWidget(`id(`chrooted), `Value);
boolean network = (boolean)UI::QueryWidget(`id(`network), `Value);
@@ -231,7 +245,7 @@
}
else
{
- AutoinstScripts::AddEditScript( scriptName, source, interpreter, type, chrooted, debug, feedback, network);
+ AutoinstScripts::AddEditScript( scriptName, source, interpreter, type, chrooted, debug, feedback, network, feedback_type);
}
}
else if (ret == `loadsource)
@@ -269,6 +283,9 @@
UI::ChangeWidget (`id(`network), `Value, false);
UI::ChangeWidget (`id(`network), `Enabled, false);
}
+ } else if( ret == `feedback ) {
+ UI::ChangeWidget( `id(`feedback_type), `Enabled, (boolean)UI::QueryWidget( `id(`feedback), `Value ) );
+ UI::ChangeWidget( `id(`feedback_type), `Value, `id("no_type") );
}
} until (ret == `save || ret == `cancel || ret == `back);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/src/include/conftree.ycp new/autoyast2-2.18.7/src/include/conftree.ycp
--- old/autoyast2-2.18.6/src/include/conftree.ycp 2009-02-06 12:33:57.000000000 +0100
+++ new/autoyast2-2.18.7/src/include/conftree.ycp 2009-07-02 12:51:28.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif
*
- * $Id: conftree.ycp 55299 2009-02-06 11:33:57Z ug $
+ * $Id: conftree.ycp 57841 2009-07-02 10:40:33Z ug $
*/
{
@@ -57,7 +57,15 @@
*/
term groups( string selectedGroup ){
list<term> itemList = [];
- foreach(string k, map v, Y2ModuleConfig::GroupMap, {
+ list<string> sortedGroups = maplist( string k, map v, Y2ModuleConfig::GroupMap, { return k; } ); // keys()
+ sortedGroups = sort( string a, string b, sortedGroups,
+ ``{ integer aa = tointeger(Y2ModuleConfig::GroupMap[a, "SortKey"]:"500");
+ integer bb = tointeger(Y2ModuleConfig::GroupMap[b, "SortKey"]:"500");
+ return ( aa != bb ) ? (aa < bb):(a < b); // by "SortKey" or alphabetical
+ });
+
+ foreach(string k, sortedGroups, {
+ map v = Y2ModuleConfig::GroupMap[k]:$[];
string desktop_file = substring( v["X-SuSE-DocTeamID"]:"", 4 );
string translation = dpgettext("desktop_translations", "/usr/share/locale/", "Name("+desktop_file+".desktop): "+v["Name"]:"" );
if( translation == "Name("+desktop_file+".desktop): "+v["Name"]:"" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/src/modules/AutoInstall.ycp new/autoyast2-2.18.7/src/modules/AutoInstall.ycp
--- old/autoyast2-2.18.6/src/modules/AutoInstall.ycp 2008-09-25 15:29:31.000000000 +0200
+++ new/autoyast2-2.18.7/src/modules/AutoInstall.ycp 2009-06-30 12:11:06.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Auto-installation related functions module
* Author: Anas Nashif
*
- * $Id: AutoInstall.ycp 51519 2008-09-25 13:20:00Z lslezak $
+ * $Id: AutoInstall.ycp 57800 2009-06-30 10:11:05Z ug $
*/
{
module "AutoInstall";
@@ -199,10 +199,16 @@
string tmpdir = (string)SCR::Read(.target.tmpdir);
string hexfile = sformat("%1/%2", tmpdir, AutoInstallRules::hostid );
map pxe = Profile::current["pxe"]:$[];
+ string dest_file = pxe["filename"]:AutoInstallRules::hostid;
+ if( dest_file == "__MAC__" ) {
+ string mac = AutoInstallRules::mac;
+ dest_file = sformat ("01-%1-%2-%3-%4-%5-%6", substring(mac,0,2), substring(mac,2,2), substring(mac,4,2),
+ substring(mac,6,2), substring(mac,8,2), substring(mac,10,2));
+ }
string server = pxe["tftp-server"]:"";
if (server!="" && pxe["pxe_localboot"]:false)
{
- y2milestone("putting pxe local boot file on server :%1", server);
+ y2milestone("putting pxe local boot file '%2' on server :%1", server, dest_file);
string config = pxe["pxelinux-config"]:"";
string dir = pxe["pxelinux-dir"]:"pxelinux.cfg";
if (config == "")
@@ -212,8 +218,7 @@
SCR::Write(.target.string, hexfile, config);
- return TFTP::Put(server, dir + "/" + AutoInstallRules::hostid,
- hexfile );
+ return TFTP::Put(server, dir + "/" + dest_file, hexfile );
}
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/src/modules/AutoinstScripts.ycp new/autoyast2-2.18.7/src/modules/AutoinstScripts.ycp
--- old/autoyast2-2.18.6/src/modules/AutoinstScripts.ycp 2009-05-08 12:24:58.000000000 +0200
+++ new/autoyast2-2.18.7/src/modules/AutoinstScripts.ycp 2009-07-01 13:50:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Custom scripts
* Authors: Anas Nashif
*
- * $Id: AutoinstScripts.ycp 57105 2009-05-08 10:24:57Z ug $
+ * $Id: AutoinstScripts.ycp 57819 2009-07-01 11:50:19Z ug $
*/
{
@@ -18,6 +18,7 @@
import "Service";
import "Popup";
import "Label";
+ import "Report";
include "autoinstall/io.ycp";
@@ -141,8 +142,7 @@
else if (s["type"]:"" == "postpartitioning-scripts")
postpart = add(postpart,s);
});
-
-
+
// clean
list<map> expre = maplist (map p, pre, ``{
return ($["filename":p["filename"]:"",
@@ -150,6 +150,7 @@
"source":p["source"]:"",
"location":p["location"]:"",
"feedback":p["feedback"]:false,
+ "feedback_type":p["feedback_type"]:"",
"debug":p["debug"]:true
]);
});
@@ -159,6 +160,7 @@
"source":p["source"]:"",
"location":p["location"]:"",
"feedback":p["feedback"]:false,
+ "feedback_type":p["feedback_type"]:"",
"debug":p["debug"]:true,
"network_needed":p["network_needed"]:false
]
@@ -171,6 +173,7 @@
"chrooted":p["chrooted"]:false,
"location":p["location"]:"",
"feedback":p["feedback"]:false,
+ "feedback_type":p["feedback_type"]:"",
"debug":p["debug"]:true
]);
});
@@ -187,6 +190,7 @@
"source":p["source"]:"",
"location":p["location"]:"",
"feedback":p["feedback"]:false,
+ "feedback_type":p["feedback_type"]:"",
"debug":p["debug"]:true
]);
});
@@ -360,7 +364,8 @@
boolean chrooted,
boolean debug,
boolean feedback,
- boolean network
+ boolean network,
+ string feedback_type
)
{
boolean mod = false;
@@ -377,6 +382,7 @@
oldScript=add(oldScript,"debug",debug);
oldScript=add(oldScript,"feedback",feedback);
oldScript=add(oldScript,"network_needed",network);
+ oldScript=add(oldScript,"feedback_type", feedback_type);
mod = true;
return oldScript;
@@ -397,6 +403,7 @@
script=add(script,"debug",debug);
script=add(script,"feedback",feedback);
script=add(script,"network_needed",network);
+ script=add(script,"feedback_type", feedback_type);
merged=add(merged,script);
}
@@ -785,7 +792,15 @@
feedback = (string)SCR::Read(.target.string, current_logdir+"/"+scriptName+".log" );
}
if( size(feedback) > 0 ) {
- Popup::LongText("", `RichText(`opt(`plainText), feedback), 50, 20 );
+ if( s["feedback_type"]:"" == "" ) {
+ Popup::LongText("", `RichText(`opt(`plainText), feedback), 50, 20 );
+ } else if( s["feedback_type"]:"" == "message" ) {
+ Report::Message( feedback );
+ } else if( s["feedback_type"]:"" == "warning" ) {
+ Report::Warning( feedback );
+ } else if( s["feedback_type"]:"" == "error" ) {
+ Report::Error( feedback );
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/src/schema/general.rnc new/autoyast2-2.18.7/src/schema/general.rnc
--- old/autoyast2-2.18.6/src/schema/general.rnc 2008-10-28 15:11:22.000000000 +0100
+++ new/autoyast2-2.18.7/src/schema/general.rnc 2009-07-06 15:10:59.000000000 +0200
@@ -43,7 +43,7 @@
}?
}
ask-list = element ask-list { LIST, ask* }
-ask = element ask { ask_question? & ask_default? & ask_help? & ask_title? & ask_type? & ask_password? & ask_path? & ask_pathlist? & ask_stage? & ask_selection? & ask_file? & ask_dialog? & ask_element? & ask_frametitle? & ask_script? }
+ask = element ask { ask_question? & ask_default? & ask_help? & ask_title? & ask_type? & ask_password? & ask_path? & ask_pathlist? & ask_stage? & ask_selection? & ask_file? & ask_dialog? & ask_element? & ask_frametitle? & ask_script? & ask_timeout? }
ask_question = element question { text }
ask_default = element default { text }
ask_help = element help { text }
@@ -60,6 +60,7 @@
ask_dialog = element dialog { text }
ask_element = element element { text }
ask_frametitle = element frametitle { text }
+ask_timeout = element timeout { INTEGER }
ask_pathlist = element pathlist {
LIST,
ask_path*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/src/schema/pxe.rnc new/autoyast2-2.18.7/src/schema/pxe.rnc
--- old/autoyast2-2.18.6/src/schema/pxe.rnc 1970-01-01 01:00:00.000000000 +0100
+++ new/autoyast2-2.18.7/src/schema/pxe.rnc 2009-06-29 13:33:17.000000000 +0200
@@ -0,0 +1,11 @@
+default namespace = "http://www.suse.com/1.0/yast2ns"
+namespace config = "http://www.suse.com/1.0/configns"
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+pxe = element pxe {
+ element pxe_localboot { BOOLEAN }? &
+ element pxelinux-config { text }? &
+ element tftp-server { text }? &
+ element pxelinux-dir { text }?
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.18.6/src/schema/scripts.rnc new/autoyast2-2.18.7/src/schema/scripts.rnc
--- old/autoyast2-2.18.6/src/schema/scripts.rnc 2007-05-21 12:26:33.000000000 +0200
+++ new/autoyast2-2.18.7/src/schema/scripts.rnc 2009-07-01 11:09:33.000000000 +0200
@@ -54,12 +54,14 @@
element location { text }? &
source? &
debug? &
- feedback?
+ feedback? &
+ feedback_type?
}
chrooted = element chrooted { BOOLEAN }
debug = element debug { BOOLEAN }
feedback = element feedback { BOOLEAN }
+feedback_type = element feedback_type { text }
filename = element filename { text }
interpreter = element interpreter { text }
source = element source { text }
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org