Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2013-07-01 15:52:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2013-04-29 14:23:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2013-07-01 15:52:44.000000000 +0200 @@ -1,0 +2,39 @@ +Wed Jun 5 14:09:59 CEST 2013 - [email protected] + +- recognize that eth-id-... and eth[0-9] may be the same device + in removeNetwork() (bnc#823124) + +------------------------------------------------------------------- +Wed May 29 13:55:21 UTC 2013 - [email protected] + +- version 2.24.3 +- updated loading mouse database (changed in yast2-mouse) + +------------------------------------------------------------------- +Tue May 28 19:14:47 CEST 2013 - [email protected] + +- avoid using widget id `help seems to conflict with global + Help-Widget (bnc#822009) + +------------------------------------------------------------------- +Thu May 16 12:46:08 CEST 2013 - [email protected] + +- change removal of network devices in inst_autoconfigure (bnc#817797) + +------------------------------------------------------------------- +Wed May 8 16:03:42 CEST 2013 - [email protected] + +- version 2.24.2 +- allow location-tag for file_scripts to fetch them via net + +------------------------------------------------------------------- +Tue May 7 16:32:26 CEST 2013 - [email protected] + +- add device_order and subvolumes to partitioning.rnc + +------------------------------------------------------------------- +Tue Apr 30 19:05:50 CEST 2013 - [email protected] + +- fix autoinst scheme with usb (if not mounted) (bnc#817871) + +------------------------------------------------------------------- Old: ---- autoyast2-2.24.1.tar.bz2 New: ---- autoyast2-2.24.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.rdh2GJ/_old 2013-07-01 15:52:45.000000000 +0200 +++ /var/tmp/diff_new_pack.rdh2GJ/_new 2013-07-01 15:52:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 2.24.1 +Version: 2.24.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-2.24.1.tar.bz2 -> autoyast2-2.24.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/VERSION new/autoyast2-2.24.3/VERSION --- old/autoyast2-2.24.1/VERSION 2013-04-25 14:56:31.000000000 +0200 +++ new/autoyast2-2.24.3/VERSION 2013-05-29 16:56:33.000000000 +0200 @@ -1 +1 @@ -2.24.1 +2.24.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/configure new/autoyast2-2.24.3/configure --- old/autoyast2-2.24.1/configure 2013-04-25 14:56:42.000000000 +0200 +++ new/autoyast2-2.24.3/configure 2013-06-28 17:08:04.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for autoyast2 2.24.1. +# Generated by GNU Autoconf 2.69 for autoyast2 2.24.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.24.1' -PACKAGE_STRING='autoyast2 2.24.1' +PACKAGE_VERSION='2.24.3' +PACKAGE_STRING='autoyast2 2.24.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,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.24.1 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.24.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of autoyast2 2.24.1:";; + short | recursive ) echo "Configuration of autoyast2 2.24.3:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.24.1 +autoyast2 configure 2.24.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,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.24.1, which was +It was created by autoyast2 $as_me 2.24.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.24.1' + VERSION='2.24.3' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.24.1" +VERSION="2.24.3" RPMNAME="autoyast2" MAINTAINER="Thomas Fehr <[email protected]>" @@ -3407,7 +3407,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.24.1, which was +This file was extended by autoyast2 $as_me 2.24.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3460,7 +3460,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -autoyast2 config.status 2.24.1 +autoyast2 config.status 2.24.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/configure.in new/autoyast2-2.24.3/configure.in --- old/autoyast2-2.24.1/configure.in 2013-04-25 14:56:38.000000000 +0200 +++ new/autoyast2-2.24.3/configure.in 2013-06-28 17:08:00.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for autoyast2 dnl -dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.24.1, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.24.3, 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.24.1" +VERSION="2.24.3" RPMNAME="autoyast2" MAINTAINER="Thomas Fehr <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/clients/inst_autoconfigure.ycp new/autoyast2-2.24.3/src/clients/inst_autoconfigure.ycp --- old/autoyast2-2.24.1/src/clients/inst_autoconfigure.ycp 2013-04-23 13:36:31.000000000 +0200 +++ new/autoyast2-2.24.3/src/clients/inst_autoconfigure.ycp 2013-06-06 16:26:33.000000000 +0200 @@ -42,15 +42,62 @@ return; }; + string MatchInterface( string id ) + { + string ret = id; + if( substring( id, 0, 7 )=="eth-id-" ) + { + list<string> ls = splitstring( substring( id, 7 ), ":" ); + ls = maplist( string s, ls, ``((size(s)<2)?("0"+s):s)); + y2milestone( "MatchInterface ls:%1", ls ); + string cmd = sformat( "ifconfig | grep -i \"hwaddr.*%1\"", + mergestring(ls,":")); + map bo = (map)SCR::Execute(.target.bash_output, cmd); + ls = splitstring( bo["stdout"]:"", "\n" ); + ls = filter( string s, splitstring( ls[0]:"", " \t" ), ``(!isempty(s))); + if( !isempty(ls) && substring( ls[0]:"", 0, 3 )=="eth" ) + ret = ls[0]:""; + } + y2milestone( "MatchInterface id:%1 ret:%2", id, ret ); + return( ret ); + } - define void removeNetwork() { + define void removeNetwork( list<map> ilist ) { + import "NetworkInterfaces"; + y2milestone( "removeNetwork ifaces:%1", ilist ); + ilist = maplist( map i, ilist, + { + if( substring( i["device"]:"", 0, 7 )=="eth-id-" ) + i["device"] = MatchInterface(i["device"]:""); + return( i ); + }); + y2milestone( "removeNetwork ifaces:%1", ilist ); any l = SCR::Read (.target.dir, ["/etc/sysconfig/network", [] ]); + list<string> netlist = []; + y2milestone( "removeNetwork list:%1", l ); foreach( string s, (list<string>)l, ``{ if( issubstring( s, "ifcfg-" ) && !issubstring( s, "ifcfg-lo" ) ) { - y2milestone("removing installation network: /etc/sysconfig/network/%1",s); - SCR::Execute(.target.remove, sformat("/etc/sysconfig/network/%1",s) ); + if( substring( s, 0, 6 )=="ifcfg-" && s!="ifcfg-lo" ) + { + string net = substring( s, 6 ); + list tmp = filter( map l, ilist, ``(l["device"]:""==net)); + if( isempty(tmp) ) + { + y2milestone( "removeNetwork net:%1", net ); + NetworkInterfaces::Delete( net ); + netlist = add( netlist, net ); + y2milestone("removing installation network: /etc/sysconfig/network/%1",s); + SCR::Execute(.target.remove, sformat("/etc/sysconfig/network/%1",s) ); + } + } } }); + y2milestone( "removeNetwork netlist:%1", netlist ); + if( !isempty(netlist) ) + { + NetworkInterfaces::Commit(); + /*NetworkInterfaces::Write( ".*" );*/ + } return; } @@ -149,9 +196,9 @@ // keep network on AutoYaST ugprade if (! Mode::autoupgrade()) { if (!haskey(Profile::current , "networking") ) { - removeNetwork(); // no networking section -> no network + removeNetwork( [] ); // no networking section -> no network } else if( Profile::current["networking","keep_install_network"]:false == false ) { - removeNetwork(); // networking section without keeping the install network + removeNetwork( Profile::current["networking","interfaces"]:[] ); // networking section without keeping the install network } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/dialogs/general_dialogs.ycp new/autoyast2-2.24.3/src/dialogs/general_dialogs.ycp --- old/autoyast2-2.24.1/src/dialogs/general_dialogs.ycp 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.3/src/dialogs/general_dialogs.ycp 2013-05-28 19:21:30.000000000 +0200 @@ -334,7 +334,7 @@ `RadioButtonGroup( `id( `stage ), `HBox( `RadioButton(`id( `stage_initial ), `opt(`notify,`immediate),_("1st Stage"), true ), `RadioButton(`id( `stage_cont ), `opt(`notify,`immediate),_("2nd Stage") ) ) ), `TextEntry( `id(`dialogTitle), _("Dialog Title"), title ), - `MultiLineEdit( `id( `help ), _("Helptext"), help ), + `MultiLineEdit( `id( `hlp ), _("Helptext"), help ), `HBox( `PushButton( `id( `addDialog ), `opt( `default, `hstretch ), _("Add to Dialog List") ), `PushButton( `id( `applyDialog ), `opt( `default, `hstretch ), _("Apply changes to dialog") ) @@ -439,7 +439,7 @@ } else if( ret == `applyDialog ) { askList = maplist ( map d, askList, ``{ if( d["dialog"]:-1 == (integer)UI::QueryWidget(`id(`dialogs), `CurrentItem) && d["stage"]:"initial" == stage ) { - d["help"] = (string)UI::QueryWidget(`id(`help), `Value); + d["help"] = (string)UI::QueryWidget(`id(`hlp), `Value); d["title"] = (string)UI::QueryWidget(`id(`dialogTitle), `Value); help = d["help"]:""; } @@ -529,7 +529,7 @@ max = max + 1; askList = add( askList, $[ "dialog":max, "title":(string)UI::QueryWidget(`id(`dialogTitle), `Value), - "help":(string)UI::QueryWidget(`id(`help), `Value), + "help":(string)UI::QueryWidget(`id(`hlp), `Value), "question":_("Edit Question"), "element":0, "stage":stage @@ -557,7 +557,7 @@ list<map> d = filter( map dummy, askList, ``{ return dummy["dialog"]:-2 == dialog_id && stage == dummy["stage"]:"initital"; }); d = sort( map x, map y, d, ``( x["element"]:-2 < y["element"]:-1 ) ); UI::ChangeWidget(`id(`dialogTitle), `Value, d[0,"title"]:""); - UI::ChangeWidget(`id(`help), `Value, d[0,"help"]:""); + UI::ChangeWidget(`id(`hlp), `Value, d[0,"help"]:""); id_counter = 0; foreach ( map m, d, ``{ id_counter = m["element"]:id_counter; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/include/io.ycp new/autoyast2-2.24.3/src/include/io.ycp --- old/autoyast2-2.24.1/src/include/io.ycp 2013-04-15 16:56:30.000000000 +0200 +++ new/autoyast2-2.24.3/src/include/io.ycp 2013-04-30 19:21:32.000000000 +0200 @@ -62,6 +62,7 @@ map toks = AutoinstConfig::urltok; toks["scheme"] = Scheme; toks["host"] = Host; + y2milestone( "Scheme:%1 Host:%2 Path:%3 Localfile:%4", Scheme, Host, Path, Localfile); if (regexpsub(Path, "(.*)//(.*)", "\\1\/\\2")!= nil) { Path = regexpsub(Path, "(.*)//(.*)", "\\1\/\\2"); @@ -314,9 +315,11 @@ } foreach( string Host, deviceList, ``{ y2milestone("looking for profile on %1", Host); - mount_point = Storage::DeviceMounted("/dev/"+Host); + string mp = Storage::DeviceMounted("/dev/"+Host); boolean already_mounted = !isempty(mount_point); - y2milestone("already mounted=%1 mountpoint=%2",already_mounted,mount_point); + if( already_mounted ) + mount_point=mp; + y2milestone("already mounted=%1 mountpoint=%2 mp=%3",already_mounted,mount_point,mp); if( ! already_mounted && !(boolean)SCR::Execute(.target.mount, [sformat("/dev/%1", Host), mount_point], "-o noatime") ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/include/xml.ycp new/autoyast2-2.24.3/src/include/xml.ycp --- old/autoyast2-2.24.1/src/include/xml.ycp 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.3/src/include/xml.ycp 2013-05-28 17:16:35.000000000 +0200 @@ -96,7 +96,8 @@ "keys":"keyid", "pathlist":"path", "proposals":"proposal", - "net-udev":"rule" + "net-udev":"rule", + "ask-list":"ask" ]; // media_url needed for ISO files on NFS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/modules/AutoinstCommon.ycp new/autoyast2-2.24.3/src/modules/AutoinstCommon.ycp --- old/autoyast2-2.24.1/src/modules/AutoinstCommon.ycp 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.3/src/modules/AutoinstCommon.ycp 2013-05-09 10:06:30.000000000 +0200 @@ -7,7 +7,7 @@ * $Id: AutoinstCommon.ycp 2788 2008-05-13 10:00:17Z sschober $ */ { - module "AutoinstCommon.ycp"; + module "AutoinstCommon"; textdomain "autoinst"; define symbol typeof( any o ){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/modules/AutoinstFile.ycp new/autoyast2-2.24.3/src/modules/AutoinstFile.ycp --- old/autoyast2-2.24.1/src/modules/AutoinstFile.ycp 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.3/src/modules/AutoinstFile.ycp 2013-05-08 16:06:31.000000000 +0200 @@ -149,10 +149,18 @@ scriptName = "script_" + name; } string scriptPath = sformat("%1/%2", AutoinstConfig::scripts_dir, scriptName); - y2milestone("Writing (file) script into %1", scriptPath); - SCR::Write(.target.string, scriptPath, script["source"]:"echo Empty script!"); - // string message = sformat(_("Executing user supplied script: %1"), scriptName); - + y2milestone("Writing (file) script into %1", scriptPath); + boolean got_script = false; + if (script["location"]:"" != "") + { + y2milestone("getting script: %1", script["location"]:"" ); + if (!GetURL(script["location"]:"", scriptPath ) ) + y2error("script %1 could not be retrieved", script["location"]:""); + else + got_script = true; + } + if( !got_script ) + SCR::Write(.target.string, scriptPath, script["source"]:"echo Empty script!"); string scriptInterpreter = script["interpreter"]:"shell"; string executionString = ""; if (scriptInterpreter == "shell") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/modules/AutoinstGeneral.ycp new/autoyast2-2.24.3/src/modules/AutoinstGeneral.ycp --- old/autoyast2-2.24.1/src/modules/AutoinstGeneral.ycp 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.3/src/modules/AutoinstGeneral.ycp 2013-05-29 16:56:33.000000000 +0200 @@ -30,6 +30,8 @@ // All shared data are in yast2.rpm to break cyclic dependencies import "AutoinstData"; + include "mouse/mouse_raw.ycp"; + // // Show proposal and ask user for confirmation to go on with auto-installation // Similar to interactive mode, without letting use change settings @@ -267,7 +269,7 @@ string device = AutoinstData::mouse["device"]:"none"; integer wheels = AutoinstData::mouse["wheels"]:0; - map<string, list> mice = (map<string, list>)Misc::ReadAlternateFile ("mouse_db.ycp", "mouse_raw.ycp"); + map<string, list> mice = get_mouse_db(); foreach(string f,list g, mice, ``{ map data = g[1]:$[]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/modules/AutoinstPartPlan.ycp new/autoyast2-2.24.3/src/modules/AutoinstPartPlan.ycp --- old/autoyast2-2.24.1/src/modules/AutoinstPartPlan.ycp 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.3/src/modules/AutoinstPartPlan.ycp 2013-05-07 16:36:31.000000000 +0200 @@ -471,8 +471,14 @@ string defsub = ""; if( !isempty(FileSystems::default_subvol) ) defsub = FileSystems::default_subvol + "/"; - new_pe["subvolumes"] = maplist( map p, (list<map>)pe["subvol"]:[], - ``({return( substring(p["name"]:"",size(defsub)));})); + new_pe["subvolumes"] = + maplist( map p, (list<map>)pe["subvol"]:[], ``( + { + if( size(defsub)>0 && substring(p["name"]:"",0,size(defsub))==defsub ) + return( substring(p["name"]:"",size(defsub))); + else + return( p["name"]:"" ); + })); new_pe["subvolumes"] = filter( string s, new_pe["subvolumes"]:[], ``(!isempty(s))); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/schema/files.rnc new/autoyast2-2.24.3/src/schema/files.rnc --- old/autoyast2-2.24.1/src/schema/files.rnc 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.3/src/schema/files.rnc 2013-05-08 16:06:31.000000000 +0200 @@ -17,4 +17,4 @@ file_path = element file_path { text } file_permissions = element file_permissions { text } file_owner = element file_owner { text } -file_script = element file_script { interpreter, source } +file_script = element file_script { interpreter & source? & element location { text }? } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/schema/general.rnc new/autoyast2-2.24.3/src/schema/general.rnc --- old/autoyast2-2.24.1/src/schema/general.rnc 2013-02-19 13:06:31.000000000 +0100 +++ new/autoyast2-2.24.3/src/schema/general.rnc 2013-05-08 16:06:31.000000000 +0200 @@ -61,6 +61,7 @@ ask_title = element title { text } ask_type = element type { ( "symbol" | "integer" | "boolean" | "string" ) } ask_password = element password { BOOLEAN } +ask_path = element path { text } ask_stage = element stage { "cont" | "initial" } ask_selection = element selection { LIST, ask_selection_entry+ } ask_selection_entry = element entry { ask_entry_value & ask_entry_label } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.1/src/schema/partitioning.rnc new/autoyast2-2.24.3/src/schema/partitioning.rnc --- old/autoyast2-2.24.1/src/schema/partitioning.rnc 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.3/src/schema/partitioning.rnc 2013-05-07 16:36:31.000000000 +0200 @@ -55,6 +55,8 @@ | part_stripesize | part_pool | part_used_pool + | device_order + | subvolumes partition = element partition { y2_partition* } part_create = @@ -103,6 +105,11 @@ element device { text }* } +subvolumes = element subvolumes { + LIST, + element listentry { text }* +} + part_fstopt = element fstopt { text } part_label = element label { text } part_loop_fs = -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
