Hello community, here is the log from the commit of package autoyast2 checked in at Mon Oct 30 17:54:03 CET 2006. -------- --- autoyast2/autoyast2.changes 2006-10-17 09:58:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2006-10-30 16:25:18.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Oct 30 16:13:20 CET 2006 - ug@suse.de + +- 2.14.11 + +------------------------------------------------------------------- +Wed Oct 18 11:47:39 CEST 2006 - ug@suse.de + +- fix in the partitioning dialog + +------------------------------------------------------------------- +Wed Oct 18 10:53:00 CEST 2006 - ug@suse.de + +- minor changes in the software cloning + +------------------------------------------------------------------- +Tue Oct 17 15:06:32 CEST 2006 - ug@suse.de + +- support for selections dropped + +------------------------------------------------------------------- @@ -5 +25 @@ - (use inst-source-utils instead) + (use inst-server-utils instead) Old: ---- autoyast2-2.14.10.tar.bz2 New: ---- autoyast2-2.14.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.iYOjwZ/_old 2006-10-30 17:53:30.000000000 +0100 +++ /var/tmp/diff_new_pack.iYOjwZ/_new 2006-10-30 17:53:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.14.10) +# spec file for package autoyast2 (Version 2.14.11) # # 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.10 +Version: 2.14.11 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.14.10.tar.bz2 +Source0: autoyast2-2.14.11.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.10 +Version: 2.14.11 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -70,7 +70,7 @@ Anas Nashif %prep -%setup -n autoyast2-2.14.10 +%setup -n autoyast2-2.14.11 %build %{prefix}/bin/y2tool y2autoconf @@ -212,9 +212,17 @@ %dir /var/lib/autoinstall/autoconf %changelog -n autoyast2 +* Mon Oct 30 2006 - ug@suse.de +- 2.14.11 +* Wed Oct 18 2006 - ug@suse.de +- fix in the partitioning dialog +* Wed Oct 18 2006 - ug@suse.de +- minor changes in the software cloning +* Tue Oct 17 2006 - ug@suse.de +- support for selections dropped * Tue Oct 17 2006 - ug@suse.de - autoyast2-utils dropped - (use inst-source-utils instead) + (use inst-server-utils instead) - 2.14.10 * Mon Oct 16 2006 - ug@suse.de - Signature checks turned off in UI ++++++ autoyast2-2.14.10.tar.bz2 -> autoyast2-2.14.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/VERSION new/autoyast2-2.14.11/VERSION --- old/autoyast2-2.14.10/VERSION 2006-10-17 09:27:37.000000000 +0200 +++ new/autoyast2-2.14.11/VERSION 2006-10-30 16:14:23.000000000 +0100 @@ -1 +1 @@ -2.14.10 +2.14.11 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/configure new/autoyast2-2.14.11/configure --- old/autoyast2-2.14.10/configure 2006-10-17 09:27:50.000000000 +0200 +++ new/autoyast2-2.14.11/configure 2006-10-30 16:14:35.000000000 +0100 @@ -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.10. +# Generated by GNU Autoconf 2.59 for autoyast2 2.14.11. # # 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.10' -PACKAGE_STRING='autoyast2 2.14.10' +PACKAGE_VERSION='2.14.11' +PACKAGE_STRING='autoyast2 2.14.11' 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.10 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.14.11 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.10:";; + short | recursive ) echo "Configuration of autoyast2 2.14.11:";; 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.10 +autoyast2 configure 2.14.11 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.10, which was +It was created by autoyast2 $as_me 2.14.11, 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.10' + VERSION='2.14.11' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.14.10" +VERSION="2.14.11" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" @@ -2810,7 +2810,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by autoyast2 $as_me 2.14.10, which was +This file was extended by autoyast2 $as_me 2.14.11, 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.10 +autoyast2 config.status 2.14.11 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.10/configure.in new/autoyast2-2.14.11/configure.in --- old/autoyast2-2.14.10/configure.in 2006-10-17 09:27:45.000000000 +0200 +++ new/autoyast2-2.14.11/configure.in 2006-10-30 16:14:29.000000000 +0100 @@ -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.10, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.14.11, 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.10" +VERSION="2.14.11" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/doc/CreateProfileDetails.xml new/autoyast2-2.14.11/doc/CreateProfileDetails.xml --- old/autoyast2-2.14.10/doc/CreateProfileDetails.xml 2006-09-08 12:00:52.000000000 +0200 +++ new/autoyast2-2.14.11/doc/CreateProfileDetails.xml 2006-10-17 12:06:41.000000000 +0200 @@ -1572,6 +1572,21 @@ </screen> </example> </section> + <section> + <title>Installing packages during stage 2</title> + <para> + if you want to install packages after the reboot during stage 2, instead of + during the normal installation process in stage 1, you can use the + <emphasis>post-packages</emphasis> element for that: + </para> + <screen> +<software> + <post-packages config:type="list"> + <package>yast2-cim</package> + </post-packages> +</software> + </screen> + </section> </section> <section id="CreateProfile.Services"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/clients/software_auto.ycp new/autoyast2-2.14.11/src/clients/software_auto.ycp --- old/autoyast2-2.14.10/src/clients/software_auto.ycp 2006-05-29 17:54:05.000000000 +0200 +++ new/autoyast2-2.14.11/src/clients/software_auto.ycp 2006-10-17 15:06:59.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Anas Nashif (nashif@suse.de) * Summary: Handle Package selections and packages * - * $Id: software_auto.ycp 31177 2006-05-29 15:54:03Z ug $ + * $Id: software_auto.ycp 33473 2006-10-17 13:06:57Z ug $ */ { @@ -66,13 +66,6 @@ helptext, false, true); list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); y2milestone("available patterns %1",patterns); - list<string> available_base_selections = Pkg::GetSelections( `available, "base" ); - y2milestone ("available_base_selections %1", available_base_selections); - list current_base_selections = Pkg::GetSelections( `selected, "base" ); - y2milestone ("current_base_selections %1", current_base_selections); - - // save the current base selection - string save_selection = current_base_selections[0]:"default"; // Construct a box with radiobuttons for each software base configuration term baseconfs_box = `VBox(); @@ -99,122 +92,6 @@ if ( ret == `accept ) ret = `next; } - } else { - map<string, list> sorted_base_selections = $[]; - foreach( string selection, available_base_selections, - ``{ - map selection_data = Pkg::SelectionData (selection); - if (selection_data != nil) - { - string order = selection_data["order"]:""; - // use selection name as sort criteria if not given - if (order == "") - { - order = selection; - } - sorted_base_selections[order] = [selection, selection_data["summary"]:("'"+selection+"'")]; - } - }); - - boolean selected = false; - // construct display box in order - foreach(string order, list data, sorted_base_selections, - ``{ - { - if (AutoinstSoftware::base == "" && !selected) - { - AutoinstSoftware::base = data[0]:""; - selected = true; - } - baseconfs_box = add( baseconfs_box, `Left(`RadioButton(`id(data[0]:""), // id - `opt(`notify, `autoShortcut), - data[1]:"", // descrption - (data[0]:"" == AutoinstSoftware::base) ))); - } - }); - - term contents = `HVSquash( - `VBox( - `HSquash( - `VBox( - `Frame( - // Frame caption for software selection - _("Software"), - `VBox( - `VSpacing(0.3), - `RadioButtonGroup(`id(`baseconf),`opt(`notify), baseconfs_box), - `VSpacing(0.3) - ) - ), - `VSpacing(), - - // Push button that will pop up the detailed - // software selection (e.g. Multimedia, Games, - // KDE, Gnome, ... - not the individual packages!) - `PushButton( `id(`details), _("&Detailed selection...") ) - ) - ) - ) - ); - - Wizard::SetContents(title, contents, helptext, true, true); - // Wizard::DisableBackButton(); - Wizard::HideAbortButton(); - ret = nil; - boolean error_found = false; - boolean selret = false; - repeat - { - ret = Wizard::UserInput(); - - // get the newly selected base configuration - string base_selection = (string) UI::QueryWidget( `id(`baseconf),`CurrentButton ); - - // Inform the package manager on `next about the new (only about a NEW) selection - // or if the selection has changed - if (ret == `next) - { - // set the new selection - Pkg::PkgReset(); - boolean pkgret = Pkg::SetSelection( base_selection ); - if (size(PackageAI::toinstall ) > 0) - { - foreach(string p, PackageAI::toinstall, ``{ - y2milestone("selecting package for installation: %1 -> %2", p, Pkg::PkgInstall(p)); - }); - } - } - else if ( ret == `details ) - { - ret = `again; - Pkg::PkgReset(); - list base_selections = Pkg::GetSelections (`installed, "base"); - Pkg::ClearSelection(base_selections[0]:""); - Pkg::SetSelection( base_selection ); - - foreach(string addon, AutoinstSoftware::addons, ``{ - Pkg::SetSelection( addon ); - }); - - Pkg::ActivateSelections(); - if (size(PackageAI::toinstall) > 0) - { - foreach(string p, PackageAI::toinstall, ``{ - y2milestone("selecting package for installation: %1 -> %2", p, Pkg::PkgInstall(p)); - }); - } - - while ( ret == `again ) - { - ret = (symbol)WFM::CallFunction( "inst_packages", [ true, true ] ); - - if ( ret == `accept ) - ret = `next; - } - } - } until ( ret == `next || ret == `back); - - Pkg::ActivateSelections(); } list allpacs = Pkg::GetPackages(`selected, true); y2milestone("All packages: %1 ( %2 )", allpacs, size(allpacs)); @@ -229,19 +106,13 @@ if( p["status"]:`nothing == `selected || p["status"]:`nothing == `installed ) patadd = add(patadd, p["name"]:""); }); - seladd = Pkg::GetSelections(`selected, ""); - selbase = Pkg::GetSelections(`selected, "base"); } else { - seladd = AutoinstSoftware::addons; - selbase = [AutoinstSoftware::base]; patadd = AutoinstSoftware::patterns; } PackageAI::toinstall = Pkg::FilterPackages(false, false, true, true); - AutoinstSoftware::addons = seladd; - AutoinstSoftware::base = selbase[0]:""; AutoinstSoftware::patterns = (list<string>)union( patadd, patadd); // FIXME: why are there double entries sometimes? Wizard::CloseDialog(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/Makefile.am new/autoyast2-2.14.11/src/data/rng/Makefile.am --- old/autoyast2-2.14.10/src/data/rng/Makefile.am 2006-01-13 10:22:52.000000000 +0100 +++ new/autoyast2-2.14.11/src/data/rng/Makefile.am 2006-10-30 12:06:19.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile.am for y2c_autoinst/src # -# $Id: Makefile.am 27004 2006-01-12 18:21:28Z mvidner $ +# $Id: Makefile.am 33831 2006-10-30 11:06:16Z ug $ # # THESE FILES ARE NOT USED @@ -14,23 +14,10 @@ rnc_DATA = \ bootloader.rnc \ - fw.rnc \ - inetd.rnc \ - ldap_client.rnc \ - lvm.rnc \ - mail.rnc \ - nis.rnc \ - nis_server.rnc \ - ntpclient.rnc \ online_update.rnc \ printer.rnc \ - raid.rnc \ - runlevels.rnc \ samba.rnc \ - security.rnc \ sound.rnc \ - sysconfig.rnc \ - users.rnc \ - x11.rnc + sysconfig.rnc EXTRA_DIST = $(rnc_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/Makefile.in new/autoyast2-2.14.11/src/data/rng/Makefile.in --- old/autoyast2-2.14.10/src/data/rng/Makefile.in 2006-10-17 09:27:54.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/Makefile.in 2006-10-30 16:14:39.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile.am for y2c_autoinst/src # -# $Id: Makefile.am 27004 2006-01-12 18:21:28Z mvidner $ +# $Id: Makefile.am 33831 2006-10-30 11:06:16Z ug $ # # THESE FILES ARE NOT USED @@ -184,24 +184,11 @@ rncdir = $(prefix)/share/autoinstall/rnc rnc_DATA = \ bootloader.rnc \ - fw.rnc \ - inetd.rnc \ - ldap_client.rnc \ - lvm.rnc \ - mail.rnc \ - nis.rnc \ - nis_server.rnc \ - ntpclient.rnc \ online_update.rnc \ printer.rnc \ - raid.rnc \ - runlevels.rnc \ samba.rnc \ - security.rnc \ sound.rnc \ - sysconfig.rnc \ - users.rnc \ - x11.rnc + sysconfig.rnc EXTRA_DIST = $(rnc_DATA) all: all-am diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/bootloader.rnc new/autoyast2-2.14.11/src/data/rng/bootloader.rnc --- old/autoyast2-2.14.10/src/data/rng/bootloader.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/bootloader.rnc 2006-10-24 11:28:07.000000000 +0200 @@ -4,13 +4,13 @@ bootloader = element bootloader { - activate?, - global?, - initrd_modules?, - loader_device?, - loader_type?, - location?, - repl_mbr?, + activate? & + bl_global? & + initrd_modules? & + loader_device? & + loader_type? & + bl_location? & + repl_mbr? & sections? } activate = @@ -22,24 +22,20 @@ LIST, initrd_module+ } -initrd_module = element initrd_module { module, module_args? } +initrd_module = element initrd_module { bl_module, module_args? } module_args = element module_args { text } +bl_module = element module { text } loader_device = element loader_device { text } loader_type = element loader_type { text } -# also for samba -y2_global = winbind | workgroup -global = +bl_location = element location { text } +bl_global = element global { - LIST, - (y2_global | global_entry*)* - } -global_entry = element global_entry { key, value } -key = element key { text } -value = - element value { - attribute config:type { text }?, - text + lines_cache_id? & + stage1_dev? } +lines_cache_id = element lines_cache_id { text } +stage1_dev = element stage1_dev { text } + sections = element sections { LIST, @@ -47,8 +43,17 @@ } section = element section { - LIST, - section_entry+ + element append {text}? & + element initial {text}? & + element initrd {text}? & + element kernel {text}? & + element name {text}? & + element original_name {text}? & + element root {text}? & + element type {text}? & + element vga {text}? & + element chainloader {text}? & + element lines_cache_id {text}? & + element sectors {text}? } -section_entry = element section_entry { key, value } kernel_parameters = element kernel_parameters { text } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/fw.rnc new/autoyast2-2.14.11/src/data/rng/fw.rnc --- old/autoyast2-2.14.10/src/data/rng/fw.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/fw.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace config = "http://www.suse.com/1.0/configns" - -y2_firewall = - fw_allow_fw_traceroute - | fw_autoprotect_services - | fw_dev_ext - | fw_dev_int - | fw_ipsec_trust - | fw_log_accept_all - | fw_log_accept_crit - | fw_log_drop_all - | fw_log_drop_crit - | fw_masq_nets - | fw_masquerade - | fw_protect_from_internal - | fw_route - | fw_services_ext_tcp - | fw_services_ext_udp - | fw_services_int_ip - | start_firewall -firewall = element firewall { y2_firewall* } -fw_allow_fw_traceroute = element fw_allow_fw_traceroute { text } -fw_autoprotect_services = element fw_autoprotect_services { text } -fw_dev_ext = element fw_dev_ext { text } -fw_dev_int = element fw_dev_int { text } -fw_log_accept_all = element fw_log_accept_all { text } -fw_log_accept_crit = element fw_log_accept_crit { text } -fw_log_drop_all = element fw_log_drop_all { text } -fw_log_drop_crit = element fw_log_drop_crit { text } -fw_masq_nets = element fw_masq_nets { text } -fw_masquerade = element fw_masquerade { text } -fw_protect_from_internal = element fw_protect_from_internal { text } -fw_route = element fw_route { text } -fw_services_ext_tcp = element fw_services_ext_tcp { text } -fw_ipsec_trust = element fw_ipsec_trust { text } -fw_services_ext_udp = element fw_services_ext_udp { text } -fw_services_int_ip = element fw_services_int_ip { text } -start_firewall = - element start_firewall { BOOLEAN } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/inetd.rnc new/autoyast2-2.14.11/src/data/rng/inetd.rnc --- old/autoyast2-2.14.10/src/data/rng/inetd.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/inetd.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace config = "http://www.suse.com/1.0/configns" - -inetd = - element inetd { last_created?, netd_conf, netd_service, netd_status? } -netd_service = - element netd_service { SYMBOL } -netd_status = - element netd_status { INTEGER } -conf = element conf { protocol, script, server, service } -# <!ELEMENT protocol (#PCDATA)> -# <!ELEMENT script (#PCDATA)> -# <!ELEMENT server (#PCDATA)> -# <!ELEMENT service (#PCDATA)> -netd_conf = - element netd_conf { - LIST, - conf* - } -start_inetd = - element start_inetd { - attribute config:type { text }, - text - } -last_created = - element last_created { INTEGER } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/ldap_client.rnc new/autoyast2-2.14.11/src/data/rng/ldap_client.rnc --- old/autoyast2-2.14.10/src/data/rng/ldap_client.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/ldap_client.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace config = "http://www.suse.com/1.0/configns" - -y2_ldap_client = - base_config_dn - | bind_dn - | file_server - | ldap_domain - | ldap_server - | ldap_tls - | ldap_v2 - | start_ldap -ldap = element ldap { y2_ldap_client } -ldap_domain = element ldap_domain { text } -ldap_server = element ldap_server { text } -base_config_dn = element base_config_dn { text } -bind_dn = element bind_dn { text } -file_server = - element file_server { BOOLEAN } -ldap_tls = - element ldap_tls { BOOLEAN } -ldap_v2 = - element ldap_v2 { BOOLEAN } -start_ldap = - element start_ldap { BOOLEAN } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/lvm.rnc new/autoyast2-2.14.11/src/data/rng/lvm.rnc --- old/autoyast2-2.14.10/src/data/rng/lvm.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/lvm.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace config = "http://www.suse.com/1.0/configns" - -lvm = - element lvm { - attribute config:type { text }, - lvm_group+ - } -logical_volumes = - element logical_volumes { - attribute config:type { text }, - lv+ - } -lv = element lv { lv_fs, lv_mount, lv_name, lv_size } -lv_fs = - element lv_fs { - attribute config:type { text }, - text - } -lv_mount = element lv_mount { text } -lv_name = element lv_name { text } -lvm_name = element lvm_name { text } -lv_size = element lv_size { text } -# <!ELEMENT mount (#PCDATA)> -pesize = element pesize { text } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/mail.rnc new/autoyast2-2.14.11/src/data/rng/mail.rnc --- old/autoyast2-2.14.10/src/data/rng/mail.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/mail.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace config = "http://www.suse.com/1.0/configns" - -address = element address { text } -alias = element alias { (text | alias | comment | destinations)* } -aliases = - element aliases { - LIST, - alias+ - } -connection_type = - element connection_type { - attribute config:type { text }, - text - } -destinations = element destinations { text } -# <!ELEMENT domain (#PCDATA)> redefined in networking -domains = element domains { text } -fetchmail = - element fetchmail { - LIST, - fetchmail_entry+ - } -fetchmail_entry = - element fetchmail_entry { - local_user, password, protocol, remote_user, server - } -from_header = element from_header { text } -listen_remote = - element listen_remote { - attribute config:type { text }, - text - } -local_domains = - element local_domains { - LIST, - domains - } -local_user = element local_user { text } -mail = - element mail { - aliases?, - connection_type, - fetchmail?, - from_header?, - listen_remote?, - local_domains?, - masquerade_other_domains?, - masquerade_users?, - mta, - outgoing_mail_server?, - use_amavis?, - virtual_users? - } -masquerade_other_domains = - element masquerade_other_domains { - LIST, - domain+ - } -masquerade_user = element masquerade_user { address, comment, user } -masquerade_users = - element masquerade_users { - LIST, - masquerade_user+ - } -mta = - element mta { SYMBOL } -outgoing_mail_server = element outgoing_mail_server { text } -password = element password { text } -protocol = element protocol { text } -remote_user = element remote_user { text } -server = element server { text } -use_amavis = - element use_amavis { BOOLEAN } -# <!ELEMENT user (#PCDATA)> -virtual_user = element virtual_user { alias, comment, destinations } -virtual_users = - element virtual_users { - LIST, - virtual_user+ - } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/nis.rnc new/autoyast2-2.14.11/src/data/rng/nis.rnc --- old/autoyast2-2.14.10/src/data/rng/nis.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/nis.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -nis = - element nis { - element start_nis { BOOLEAN }? & - element nis_by_dhcp {BOOLEAN }? & - nis_domain? & # may be set by dhcp - nis_servers? & - nis_broadcast? & - element nis_other_domains { - LIST, - element nis_other_domain { - nis_domain & # here it is mandatory - nis_servers? & - nis_broadcast? - } - }? & - element nis_broken_server { BOOLEAN }? & - element nis_local_only { BOOLEAN }? & - element nis_options { text }? & - - element start_autofs { BOOLEAN }? - } - -nis_domain = - element nis_domain { text } - -nis_servers = - element nis_servers { - LIST, - element nis_server { text }* - } - -nis_broadcast = - element nis_broadcast { BOOLEAN } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/nis_server.rnc new/autoyast2-2.14.11/src/data/rng/nis_server.rnc --- old/autoyast2-2.14.10/src/data/rng/nis_server.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/nis_server.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -# NIS Server -y2_nisserver = - domain - | maps_to_serve - | merge_group - | merge_passwd - | nopush - | pwd_chfn - | pwd_chsh - | pwd_srcdir - | securenets - | server_type - | slaves - | start_ypbind - | start_yppasswdd - | start_ypxfrd - | mingid - | minuid -comment = element comment { text } -flag = element flag { text } -forename = element forename { text } -mingid = - element mingid { INTEGER } -grouplist = element grouplist { text } -hash = element hash { text } -home = element home { text } -inact = element inact { text } -last_change = element last_change { text } -maps_to_serve = - element maps_to_serve { - LIST, - nis_map* - } -max = element max { text } -merge_passwd = - element merge_passwd { BOOLEAN } -merge_group = - element merge_group { BOOLEAN } -min = element min { text } -nis_map = element nis_map { text } -nopush = - element nopush { BOOLEAN } -y2_password_settings = - expire | flag | inact | last_change | max | min | warn -password_settings = element password_settings { y2_password_settings* } -pwd_chfn = - element pwd_chfn { BOOLEAN } -pwd_chsh = - element pwd_chsh { BOOLEAN } -pwd_srcdir = element pwd_srcdir { text } -securenet = element securenet { comment?, hash?, netmask?, network? } -securenets = - element securenets { - LIST, - securenet* - } -server_type = element server_type { text } -slave = element slave { text } -slaves = - element slaves { - LIST, - slave* - } -start_ypbind = - element start_ypbind { BOOLEAN } -start_yppasswdd = - element start_yppasswdd { BOOLEAN } -start_ypxfrd = - element start_ypxfrd { BOOLEAN } -minuid = - element minuid { INTEGER } -warn = element warn { text } -nis_by_dhcp = - element nis_by_dhcp { BOOLEAN } -# Common -nis_server = element nis_server { y2_nisserver* } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/ntpclient.rnc new/autoyast2-2.14.11/src/data/rng/ntpclient.rnc --- old/autoyast2-2.14.10/src/data/rng/ntpclient.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/ntpclient.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace config = "http://www.suse.com/1.0/configns" - -ntp-client = - element ntp-client { - configure_dhcp?, peers, start_at_boot, start_in_chroot? - } -create_symlink = - element create_symlink { BOOLEAN } -configure_dhcp = - element configure_dhcp { BOOLEAN } -initial_sync = - element initial_sync { BOOLEAN } -fudge_comment = element fudge_comment { text } -fudge_options = element fudge_options { text } -param = element param { text } -peer = - element peer { - (address - | comment - | create_symlink - | device - | fudge_comment - | fudge_options - | initial_sync - | options - | param - | type)* - } -peers = - element peers { - LIST, - peer+ - } -start_at_boot = - element start_at_boot { BOOLEAN } -start_in_chroot = - element start_in_chroot { BOOLEAN } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/printer.rnc new/autoyast2-2.14.11/src/data/rng/printer.rnc --- old/autoyast2-2.14.10/src/data/rng/printer.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/printer.rnc 2006-10-25 15:09:06.000000000 +0200 @@ -47,10 +47,10 @@ | model | name | nick - | options + | printcap_entry_options | ppd_options | raw - | state + | printcap_entry_state | uri location = element location { text } bannerstart = element bannerstart { text } @@ -58,12 +58,16 @@ manufacturer = element manufacturer { text } model = element model { text } nick = element nick { text } +printcap_entry_state = element state { text } +printcap_entry_options = element options { text } ppd_options = element ppd_options { LIST, ppd_option* } -ppd_option = element ppd_option { key, value } +ppd_option = element ppd_option { ppd_option_key, ppd_option_val } +ppd_option_key = element key { text } +ppd_option_val = element value { text } denyusers = element denyusers { LIST, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/raid.rnc new/autoyast2-2.14.11/src/data/rng/raid.rnc --- old/autoyast2-2.14.10/src/data/rng/raid.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/raid.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace config = "http://www.suse.com/1.0/configns" - -raid = - element raid { - attribute config:type { text }, - raid_device+ - } -raid_device = - element raid_device { - chunk_size, - device_name, - filesystem, - format, - mount, - parity_algorithm, - persistent_superblock, - raid_level - } -chunk_size = element chunk_size { text } -device_name = element device_name { text } -parity_algorithm = element parity_algorithm { text } -persistent_superblock = element persistent_superblock { text } -raid_level = element raid_level { text } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/runlevels.rnc new/autoyast2-2.14.11/src/data/rng/runlevels.rnc --- old/autoyast2-2.14.10/src/data/rng/runlevels.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/runlevels.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace config = "http://www.suse.com/1.0/configns" - -runlevel = element runlevel { \default?, services? } -service = - element service { - BOOLEAN, - (text - | service_name - | service_status - | service_start - | service_stop)* - } -service_name = element service_name { text } -service_status = element service_status { text } -service_start = element service_start { text } -service_stop = element service_stop { text } -services = - element services { - LIST, - service+ - } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/samba.rnc new/autoyast2-2.14.11/src/data/rng/samba.rnc --- old/autoyast2-2.14.10/src/data/rng/samba.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/samba.rnc 2006-10-25 15:48:21.000000000 +0200 @@ -2,17 +2,34 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" -samba-client = element samba-client { global } -# <!ELEMENT global (winbind? , workgroup?)> +samba-client = element samba-client { smb_client_global? & smb_client_ad? & smb_client_join? } +smb_client_global = element global { + element guest_access { BOOLEAN }? & + element max_shares { INTEGER }? & + element mkhomedir { BOOLEAN }? & + element shares_group { text }? & + element winbind { BOOLEAN }? & + element winbind_caching { BOOLEAN }? & + element workgroup { text }? +} +smb_client_ad = element active_directory { + element kdc { text }? +} +smb_client_join = element join { + element password { text }? & + element user { text }? +} + winbind = element winbind { BOOLEAN } workgroup = element workgroup { text } -samba-server = - element samba-server { - client, global, role, service, shares, trusteddomains, version - } + +# FIXME: +#samba-server = +# element samba-server { +# client, global, role, service, shares, trusteddomains, version +# } role = element role { text } -client = element client { global } version = element version { text } shares = element shares { @@ -24,9 +41,15 @@ LIST, trusteddomain* } -trusteddomain = element trusteddomain { domain, password } -y2_share = options | share +trusteddomain = element trusteddomain { trusteddomain_domain, trusteddomain_password } +trusteddomain_domain = element domain { text } +trusteddomain_password = element password { text } +y2_share = samba_options | share +samba_options = element options { + LIST, + option* +} share = element share { (text | y2_share)* } -option = element option { key, value? } -# <!ELEMENT options (option*)> -# <!ELEMENT key (#PCDATA)> +option = element option { samba_option_key, samba_option_val? } +samba_option_key = element key { text } +samba_option_val = element value { text } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/security.rnc new/autoyast2-2.14.11/src/data/rng/security.rnc --- old/autoyast2-2.14.10/src/data/rng/security.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/security.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" - -console_shutdown = element console_shutdown { text } -cwd_in_root_path = element cwd_in_root_path { text } -cwd_in_user_path = element cwd_in_user_path { text } -cracklib_dict_path = element cracklib_dict_path { text } -displaymanager_remote_access = - element displaymanager_remote_access { text } -enable_sysrq = element enable_sysrq { text } -encryption = element encryption { text } -passwd_encryption = element passwd_encryption { text } -fail_delay = element fail_delay { text } -faillog_enab = element faillog_enab { text } -faillog_auth = element faillog_auth { text } -gid_max = element gid_max { text } -gid_min = element gid_min { text } -kdm_shutdown = element kdm_shutdown { text } -lastlog_enab = element lastlog_enab { text } -obscure_checks_enab = element obscure_checks_enab { text } -pass_max_days = element pass_max_days { text } -pass_max_len = element pass_max_len { text } -pass_min_days = element pass_min_days { text } -pass_min_len = element pass_min_len { text } -pass_warn_age = element pass_warn_age { text } -passwd_use_cracklib = element passwd_use_cracklib { text } -permission_security = element permission_security { text } -run_updatedb_as = element run_updatedb_as { text } -uid_max = element uid_max { text } -uid_min = element uid_min { text } -system_gid_max = element system_gid_max { text } -system_gid_min = element system_gid_min { text } -system_uid_max = element system_uid_max { text } -system_uid_min = element system_uid_min { text } -useradd_cmd = element useradd_cmd { text } -userdel_postcmd = element userdel_postcmd { text } -userdel_precmd = element userdel_precmd { text } -group_encryption = element group_encryption { text } -y2_security = - console_shutdown - | cracklib_dict_path - | cwd_in_root_path - | cwd_in_user_path - | displaymanager_remote_access - | enable_sysrq - | passwd_encryption - | fail_delay - | faillog_enab - | gid_max - | gid_min - | kdm_shutdown - | lastlog_enab - | obscure_checks_enab - | pass_max_days - | pass_max_len - | pass_min_days - | pass_min_len - | pass_warn_age - | passwd_use_cracklib - | permission_security - | run_updatedb_as - | system_gid_max - | system_gid_min - | system_uid_max - | system_uid_min - | uid_max - | uid_min - | useradd_cmd - | userdel_postcmd - | userdel_precmd - | group_encryption -security = element security { y2_security* } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/users.rnc new/autoyast2-2.14.11/src/data/rng/users.rnc --- old/autoyast2-2.14.10/src/data/rng/users.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/users.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -# <!ELEMENT group (gid, group_password, groupname, userlist)> - -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace config = "http://www.suse.com/1.0/configns" - -group_password = element group_password { text } -groupname = element groupname { text } -groups = - element groups { - attribute config:type { text }, - group+ - } -userlist = element userlist { text } -expire = element expire { text } -inactive = element inactive { text } -skel = element skel { text } -user_defaults = - element user_defaults { - expire?, group?, home?, inactive?, shell?, skel? - } -gid = - element gid { INTEGER } -encrypted = - element encrypted { BOOLEAN } -fullname = element fullname { text } -user_password = element user_password { text } -username = element username { text } -uid = element uid { text } -users = - element users { - LIST, - user* - } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/data/rng/x11.rnc new/autoyast2-2.14.11/src/data/rng/x11.rnc --- old/autoyast2-2.14.10/src/data/rng/x11.rnc 2005-06-06 11:14:37.000000000 +0200 +++ new/autoyast2-2.14.11/src/data/rng/x11.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace config = "http://www.suse.com/1.0/configns" - -color_depth = - element color_depth { INTEGER } -configure_x11 = - element configure_x11 { BOOLEAN } -y2_display = - frequency - | bandwidth - | height - | max_hsync - | max_vsync - | min_hsync - | min_vsync - | width -display = element display { y2_display* } -display_manager = element display_manager { text } -window_manager = element window_manager { text } -frequency = - element frequency { INTEGER } -enable_3d = - element enable_3d { BOOLEAN } -max_hsync = - element max_hsync { INTEGER } -max_vsync = - element max_vsync { INTEGER } -height = - element height { INTEGER } -width = - element width { INTEGER } -bandwidth = - element bandwidth { INTEGER } -min_hsync = - element min_hsync { INTEGER } -min_vsync = - element min_vsync { INTEGER } -monitor = element monitor { display, monitor_device, monitor_vendor } -monitor_device = element monitor_device { text } -monitor_vendor = element monitor_vendor { text } -resolution = element resolution { text } -start_x11 = - element start_x11 { BOOLEAN } -y2_x11 = - color_depth - | configure_x11 - | display_manager - | enable_3d - | window_manager - | monitor - | resolution - | start_x11 -x11 = element x11 { y2_x11* } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/dialogs/dialogs.ycp new/autoyast2-2.14.11/src/dialogs/dialogs.ycp --- old/autoyast2-2.14.10/src/dialogs/dialogs.ycp 2006-10-09 15:33:41.000000000 +0200 +++ new/autoyast2-2.14.11/src/dialogs/dialogs.ycp 2006-10-23 11:54:36.000000000 +0200 @@ -3,7 +3,7 @@ * Module: Auto-Installation Configuration System * Summary: This module handles the configuration for auto-installation * Authors: Anas Nashif <nashif@suse.de> - * $Id: dialogs.ycp 33278 2006-10-09 13:33:39Z ug $ + * $Id: dialogs.ycp 33571 2006-10-23 09:54:35Z ug $ */ { textdomain "autoinst"; @@ -396,7 +396,7 @@ _("Checking XML with RNC validation..."), "/usr/bin/jing >&2 -c " // only leftovers in /usr/share/autoinstall/rnc/profile.rnc - + Directory::schemadir + "/autoyast/rnc/profile.rnc", + + Directory::schemadir + "/autoyast/rnc/profile.rnc", "jing sucks" ], ]; @@ -409,8 +409,7 @@ map o = (map)SCR::Execute (.target.bash_output, cmd); y2debug("validation output: %1", o); - - summary = summary + (o["exit"]:1 == 0? html_ok: html_ko); + summary = summary + ( (o["exit"]:1 != 0 || (i[2]:"" == "jing sucks" && size(o["stderr"]:"") > 0) )? html_ko: html_ok); UpdateValidDialog (summary, o["stderr"]:""); }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/dialogs/partition_dialogs.ycp new/autoyast2-2.14.11/src/dialogs/partition_dialogs.ycp --- old/autoyast2-2.14.10/src/dialogs/partition_dialogs.ycp 2006-10-11 15:07:40.000000000 +0200 +++ new/autoyast2-2.14.11/src/dialogs/partition_dialogs.ycp 2006-10-18 11:48:41.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Anas Nashif <nashif@suse.de> * - * $Id: partition_dialogs.ycp 33327 2006-10-11 13:07:38Z ug $ + * $Id: partition_dialogs.ycp 33485 2006-10-18 09:48:40Z ug $ */ { textdomain "autoinst"; @@ -328,6 +328,7 @@ ) { UI::ChangeWidget(`id(`partsize) , `Enabled, false); + UI::ChangeWidget(`id(`partsize) , `Value, ""); } else if( UI::QueryWidget(`id(`sizeopt), `CurrentButton) == `reuse ) { UI::ChangeWidget(`id(`partsize) , `Enabled, true ); UI::ChangeWidget(`id(`resize), `Enabled, true ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/modules/AutoinstClone.ycp new/autoyast2-2.14.11/src/modules/AutoinstClone.ycp --- old/autoyast2-2.14.10/src/modules/AutoinstClone.ycp 2006-10-12 15:58:57.000000000 +0200 +++ new/autoyast2-2.14.11/src/modules/AutoinstClone.ycp 2006-10-18 10:50:06.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Anas Nashif <nashif@suse.de> * - * $Id: AutoinstClone.ycp 33356 2006-10-12 13:58:55Z ug $ + * $Id: AutoinstClone.ycp 33482 2006-10-18 08:50:05Z ug $ * * */ @@ -278,24 +278,18 @@ /** * Return list of software packages of calling client * @return map map of installed software package - * "base" -> string (base selection) - * "addons" -> list<string> addon selections + * "patterns" -> list<string> addon selections * "packages" -> list<string> user selected packages + * "remove-packages" -> list<string> packages to remove */ global define map<string, any > Software() { boolean ret = Pkg::TargetInit("/", false); - base = Pkg::GetSelections(`installed, "base"); - list<string> addons = Pkg::GetSelections(`installed, "addon"); list<string> inst = Pkg::GetPackages(`installed, true); list<map<string,any> > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); list<map<string,any> > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); - list<map<string,any> > all_xselections = Pkg::ResolvableDependencies ("", `selection, ""); list<string> patterns = []; - list<string> selections = addons; - if( size(base[0]:"") > 0 ) - selections = add(selections, base[0]:""); foreach( map<string,any> m, all_patterns, ``{ if( m["status"]:`nothing == `installed ) @@ -312,20 +306,6 @@ Pkg::SourceStartManager(true); - Pkg::SetSelection( base[0]:"" ); - foreach(string addon, addons, ``{ - Pkg::SetSelection( addon ); - }); - - Pkg::ActivateSelections(); - - /* - list<string> sel = Pkg::GetPackages(`selected, true); - foreach(string p, inst, ``{ - if (!contains(sel, p)) - Pkg::PkgInstall(p); - }); - */ /* FIXME: if this would work, it would be the better solution foreach(string p, patterns, ``{ @@ -345,7 +325,7 @@ list<map<string,any> > xpattern = filter( map<string,any> p, all_xpatterns, ``( p["name"]:"" == tmp_pattern ) ); map<string,any> found = xpattern[0]:$[]; foreach( map<string,any> d, found["dependencies"]:[], ``{ - if( d["res_kind"]:"" == "package" ) + if( d["res_kind"]:"" == "package" && d["dep_kind"]:"" == "requires" ) patternPackages = add(patternPackages, d["name"]:""); }); }); @@ -361,31 +341,9 @@ }); } - list<string> selectionPackages = []; - foreach( string tmp_selection, selections, ``{ - list<map<string,any> > xselection = filter( map<string,any> p, all_xselections, ``( p["name"]:"" == tmp_selection ) ); - map<string,any> found = xselection[0]:$[]; - foreach( map<string,any> d, found["dependencies"]:[], ``{ - if( d["res_kind"]:"" == "package" ) - selectionPackages = add(selectionPackages, d["name"]:""); - }); - }); - if( size(selections) > 0 ) { - foreach(string p, inst, ``{ - if (!contains(selectionPackages, p)) - userpackages = add( userpackages, p ); - }); - foreach(string p, selectionPackages, ``{ - if (!contains(inst,p)) - removepackages = add( removepackages, p ); - }); - } - - software["base"] = base[0]:""; - software["addons"] = addons; - software["packages"] = filter(string pkg, userpackages, ``(! regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml")); - software["patterns"] = patterns; - software["remove-packages"] = removepackages; + software["packages"] = sort( filter(string pkg, userpackages, ``(! regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml")) ); + software["patterns"] = sort( patterns ); + software["remove-packages"] = sort( removepackages ); return software; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/modules/AutoinstSoftware.ycp new/autoyast2-2.14.11/src/modules/AutoinstSoftware.ycp --- old/autoyast2-2.14.10/src/modules/AutoinstSoftware.ycp 2006-10-10 10:03:35.000000000 +0200 +++ new/autoyast2-2.14.11/src/modules/AutoinstSoftware.ycp 2006-10-17 15:06:59.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Software * Authors: Anas Nashif <nashif@suse.de> * - * $Id: AutoinstSoftware.ycp 33295 2006-10-10 08:03:34Z ug $ + * $Id: AutoinstSoftware.ycp 33473 2006-10-17 13:06:57Z ug $ * */ { @@ -30,11 +30,7 @@ global map<string, any> image = $[]; - // Base selection - global string base = ""; - - // Add-on selections - global list<string> addons = []; + // patterns global list<string> patterns = []; // Kernel, force type of kernel to be installed @@ -78,8 +74,6 @@ global define boolean Import(map settings) { Software = settings; - base = settings["base"]:""; - addons = settings["addons"]:[]; patterns = settings["patterns"]:[]; string notFound = ""; @@ -138,14 +132,9 @@ global define map Export() { map s = $[]; - if (base != "") - s["base"] = base ; if (kernel != "") s["kernel"] = kernel ; - if (addons != []) - s["addons"] = addons ; - if( patterns != []) s["patterns"] = patterns; @@ -200,38 +189,19 @@ global define string Summary() { string summary = ""; - - if( size( Pkg::GetSelections( `available, "base" ) ) > 0 ) { - summary = Summary::AddHeader(summary, _("Base Selection")); - summary = Summary::AddLine(summary, (base != "") ? - base : Summary::NotConfigured()); - summary = Summary::AddHeader(summary, _("Add-on Selections")); - if (size( addons) > 0 ) - { - summary = Summary::OpenList(summary); - foreach(string a, addons, ``{ - summary = Summary::AddListItem(summary, a); - }); - summary = Summary::CloseList(summary); - } - else - { - summary = Summary::AddLine(summary, Summary::NotConfigured()); - } - } else { - summary = Summary::AddHeader(summary, _("Selected Patterns")); - if (size( patterns ) > 0 ) - { - summary = Summary::OpenList(summary); - foreach(string a, patterns, ``{ - summary = Summary::AddListItem(summary, a); - }); - summary = Summary::CloseList(summary); - } - else - { - summary = Summary::AddLine(summary, Summary::NotConfigured()); - } + + summary = Summary::AddHeader(summary, _("Selected Patterns")); + if (size( patterns ) > 0 ) + { + summary = Summary::OpenList(summary); + foreach(string a, patterns, ``{ + summary = Summary::AddListItem(summary, a); + }); + summary = Summary::CloseList(summary); + } + else + { + summary = Summary::AddLine(summary, Summary::NotConfigured()); } summary = Summary::AddHeader(summary, _("Individually Selected Packages")); summary = Summary::AddLine(summary, sformat("%1", @@ -375,24 +345,6 @@ boolean ok = true; Packages::Init(true); - string base_selection = base; - if (size(base_selection) > 0) - { - if (! Pkg::ResolvableInstall( base_selection, `selection )) - { - y2error("Error while setting base selection: %1", base_selection); - Report::Error(sformat(_("Could not set base selection: %1"), base_selection)); - return false; - } - } -/* - else - { - Popup::Warning(_("Base selection is not set in control file. -If packages to install have been added individually, -this message can be ignored.")); - } -*/ list<string> failed = []; /* set SoftLock to avoid the installation of recommended patterns (#159466) */ @@ -408,37 +360,11 @@ } }); - foreach(string s, toset(addons), - ``{ - if (! Pkg::ResolvableInstall( s, `selection )) - { - failed = add(failed, s); - } - }); - - list<string> failed_again = []; - if (size(failed) > 0 ) { - foreach(string s, failed, - ``{ - if (!Pkg::ResolvableInstall( s, `selection )) - { - failed_again = add(failed_again, s); - } - }); - } - if (size(failed_again) > 0 ) - { - y2error("Error while setting-addon selection or pattern: %1", mergestring(failed_again, ",")); - Report::Warning(sformat(_("Could not set patterns or selections: %1."), mergestring(failed_again, ","))); - } -/* - if (!Pkg::ActivateSelections()) - { - return false; + y2error("Error while setting pattern: %1", mergestring(failed, ",")); + Report::Warning(sformat(_("Could not set patterns: %1."), mergestring(failed, ","))); } -*/ list<string> autoinstPacks = autoinstPackages (); y2milestone("Packages selected in autoinstall mode: %1", autoinstPacks); @@ -477,9 +403,6 @@ Pkg::PkgSolve(false); SpaceCalculation::ShowPartitionWarning(); - y2milestone( "INSTALLING Software Selection: base(%1), addon(%2)", - Pkg::GetSelections(`selected, "base"), - Pkg::GetSelections(`selected, "")); return (ok); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/modules/Profile.ycp new/autoyast2-2.14.11/src/modules/Profile.ycp --- old/autoyast2-2.14.10/src/modules/Profile.ycp 2006-10-09 15:33:41.000000000 +0200 +++ new/autoyast2-2.14.11/src/modules/Profile.ycp 2006-10-23 11:54:36.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Profile handling * Authors: Anas Nashif <nashif@suse.de> * - * $Id: Profile.ycp 33278 2006-10-09 13:33:39Z ug $ + * $Id: Profile.ycp 33571 2006-10-23 09:54:35Z ug $ */ { module "Profile"; @@ -635,7 +635,7 @@ [ _("Checking XML with RNG validation..."), "/usr/bin/xmllint --noout --relaxng " - + Directory::schemadir + "/autoyast/rng/profile.rng", + + Directory::schemadir + "/autoyast/rng/profile.rng", "" ] ]; @@ -643,7 +643,7 @@ validators = add( validators, [ _("Checking XML with RNC validation..."), "/usr/bin/jing >&2 -c " - + Directory::schemadir + "/autoyast/rnc/profile.rnc", + + Directory::schemadir + "/autoyast/rnc/profile.rnc", "jing_sucks" ] ); } @@ -659,7 +659,7 @@ summary = summary + cmd + "\n"; summary = summary + o["stderr"]:"" + "\n"; summary = summary + "\n"; - if( o["exit"]:1 != 0 ) + if( o["exit"]:1 != 0 || (i[2]:"" == "jing_sucks" && size(o["stderr"]:"") > 0 ) ) valid = false; }); if( ! valid ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/schema/partitioning.rnc new/autoyast2-2.14.11/src/schema/partitioning.rnc --- old/autoyast2-2.14.10/src/schema/partitioning.rnc 2006-09-08 14:08:45.000000000 +0200 +++ new/autoyast2-2.14.11/src/schema/partitioning.rnc 2006-10-18 12:39:33.000000000 +0200 @@ -15,6 +15,7 @@ is_evms_vg? & partitions? & pesize? & + device_type? & use? } initialize = @@ -61,7 +62,6 @@ | part_raid_type | part_region | part_size - | part_type | part_usepart partition = element partition { y2_partition* } part_create = @@ -137,5 +137,5 @@ pesize = element pesize { text } part_evms_group = element evms_group { text } part_resize = element resize { BOOLEAN } -part_type = element type { SYMBOL } +device_type = element type { SYMBOL } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.14.10/src/schema/scripts.rnc new/autoyast2-2.14.11/src/schema/scripts.rnc --- old/autoyast2-2.14.10/src/schema/scripts.rnc 2006-01-27 10:43:32.000000000 +0100 +++ new/autoyast2-2.14.11/src/schema/scripts.rnc 2006-10-17 11:37:21.000000000 +0200 @@ -43,7 +43,6 @@ autoinstall-init-script = element script { filename? & - interpreter? & element location { text }? & source? } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠suse.de