Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2013-04-29 14:23:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2", Maintainer is "fehr@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2013-04-05 07:24:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2013-04-29 14:23:06.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Apr 18 16:41:15 CEST 2013 - fehr@suse.de + +- version 2.24.1 +- restart all running services to cover possible config changes + when auto-client of modules are executed (bnc#804454) + +------------------------------------------------------------------- +Mon Apr 15 18:16:04 CEST 2013 - fehr@suse.de + +- prevent execution of init-scripts before they are fetched + (bnc#811688) +- recognize mounted device also when by-id names are used + in /proc/mounts (bnc#565557) + +------------------------------------------------------------------- Old: ---- autoyast2-2.24.0.tar.bz2 New: ---- autoyast2-2.24.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.Ew0wr6/_old 2013-04-29 14:23:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Ew0wr6/_new 2013-04-29 14:23:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 2.24.0 +Version: 2.24.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-2.24.0.tar.bz2 -> autoyast2-2.24.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/Makefile.am new/autoyast2-2.24.1/Makefile.am --- old/autoyast2-2.24.0/Makefile.am 2013-03-27 14:46:42.000000000 +0100 +++ new/autoyast2-2.24.1/Makefile.am 2013-04-25 14:56:38.000000000 +0200 @@ -158,19 +158,14 @@ TAGVERSION = $(Y2TOOL) tagversion -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/Makefile.am.common new/autoyast2-2.24.1/Makefile.am.common --- old/autoyast2-2.24.0/Makefile.am.common 2013-03-27 14:46:42.000000000 +0100 +++ new/autoyast2-2.24.1/Makefile.am.common 2013-04-25 14:56:38.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/Makefile.in new/autoyast2-2.24.1/Makefile.in --- old/autoyast2-2.24.0/Makefile.in 2013-03-27 14:46:46.000000000 +0100 +++ new/autoyast2-2.24.1/Makefile.in 2013-04-25 14:56:43.000000000 +0200 @@ -980,19 +980,14 @@ package: check-up-to-date check-tagversion check-textdomain package-local -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/VERSION new/autoyast2-2.24.1/VERSION --- old/autoyast2-2.24.0/VERSION 2013-03-14 18:14:49.000000000 +0100 +++ new/autoyast2-2.24.1/VERSION 2013-04-25 14:56:31.000000000 +0200 @@ -1 +1 @@ -2.24.0 +2.24.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/configure new/autoyast2-2.24.1/configure --- old/autoyast2-2.24.0/configure 2013-03-27 14:46:45.000000000 +0100 +++ new/autoyast2-2.24.1/configure 2013-04-25 14:56:42.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.0. +# Generated by GNU Autoconf 2.69 for autoyast2 2.24.1. # # 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.0' -PACKAGE_STRING='autoyast2 2.24.0' +PACKAGE_VERSION='2.24.1' +PACKAGE_STRING='autoyast2 2.24.1' 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.0 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.24.1 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.0:";; + short | recursive ) echo "Configuration of autoyast2 2.24.1:";; 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.0 +autoyast2 configure 2.24.1 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.0, which was +It was created by autoyast2 $as_me 2.24.1, 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.0' + VERSION='2.24.1' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.24.0" +VERSION="2.24.1" RPMNAME="autoyast2" MAINTAINER="Thomas Fehr <fehr@suse.de>" @@ -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.0, which was +This file was extended by autoyast2 $as_me 2.24.1, 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.0 +autoyast2 config.status 2.24.1 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.0/configure.in new/autoyast2-2.24.1/configure.in --- old/autoyast2-2.24.0/configure.in 2013-03-27 14:46:42.000000000 +0100 +++ new/autoyast2-2.24.1/configure.in 2013-04-25 14:56:38.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for autoyast2 dnl -dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.24.0, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.24.1, 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.0" +VERSION="2.24.1" RPMNAME="autoyast2" MAINTAINER="Thomas Fehr <fehr@suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/scripts/autoyast-initscripts.service new/autoyast2-2.24.1/scripts/autoyast-initscripts.service --- old/autoyast2-2.24.0/scripts/autoyast-initscripts.service 2013-03-25 11:41:32.000000000 +0100 +++ new/autoyast2-2.24.1/scripts/autoyast-initscripts.service 2013-04-15 19:11:30.000000000 +0200 @@ -1,6 +1,6 @@ [Unit] Description=Autoyast2 Init Scripts -After=remote-fs.target network.target time-sync.target mail-transfer-agent.target hwscan.service ypbind.service +After=remote-fs.target network.target time-sync.target mail-transfer-agent.target hwscan.service ypbind.service YaST2-Second-Stage.service [Service] Type=oneshot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/src/clients/Makefile.in new/autoyast2-2.24.1/src/clients/Makefile.in --- old/autoyast2-2.24.0/src/clients/Makefile.in 2013-03-27 14:46:47.000000000 +0100 +++ new/autoyast2-2.24.1/src/clients/Makefile.in 2013-04-25 14:56:44.000000000 +0200 @@ -514,7 +514,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/src/clients/inst_autoconfigure.ycp new/autoyast2-2.24.1/src/clients/inst_autoconfigure.ycp --- old/autoyast2-2.24.0/src/clients/inst_autoconfigure.ycp 2013-02-19 11:51:31.000000000 +0100 +++ new/autoyast2-2.24.1/src/clients/inst_autoconfigure.ycp 2013-04-23 13:36:31.000000000 +0200 @@ -77,6 +77,36 @@ return; } +void wait_systemd_finished( integer max_wait, list<string> ser_ignore ) + { + y2milestone("wait_systemd_finished max_wait=%1 ser_ignore=%2", max_wait, ser_ignore ); + integer st_time = time(); + integer cur_time = st_time; + integer last_busy = st_time; + string cmd = "systemctl --full list-jobs"; + while( (cur_time-st_time)<=max_wait && (cur_time-last_busy)<5 ) + { + map out = (map)SCR::Execute( .target.bash_output, cmd ); + y2milestone("wait_systemd_finished ret exit:%1 stderr:%2", out["exit"]:-1, out["stderr"]:"" ); + list<string> sl = splitstring( out["stdout"]:"", "\n" ); + y2milestone("sl=%1", sl ); + list<list> ll = maplist( string s, sl, + ``(filter( string e, + splitstring( s, " \t"), + ``(!isempty(e)) ))); + ll = filter( list l, ll, ``(l[3]:""=="running")); + integer cnt = size( filter( list l, ll, + ``(!contains( ser_ignore, l[1]:"" )))); + y2milestone("size ll=%1 ll:%2", cnt, ll ); + if( cnt>0 ) + last_busy = cur_time; + sleep( 500 ); + cur_time = time(); + y2milestone( "wait_systemd_finished time:%1 idle:%2", cur_time-st_time, cur_time-last_busy ); + } + y2milestone( "wait_systemd_finished waited time:%1", cur_time-st_time ); + } + // Help text for last dialog of base installation string help_text = _("<p> Please wait while the system is being configured. @@ -248,43 +278,35 @@ AutoinstScripts::Write("init-scripts", false); + integer max_wait = Profile::current["general","mode","max_systemd_wait"]:30; + list<string> ser_ignore = [ "YaST2-Second-Stage.service", + "autoyast-initscripts.service" ]; + list<string> ser_no_restart = [ "systemd-logind.service" ]; + + logStep( _("Restarting all running services")); + string cmd = "systemctl --type=service list-units | grep \" running \" | sed s/[[:space:]].*//"; + map out = (map)SCR::Execute( .target.bash_output, cmd ); + list<string> sl = filter( string s, splitstring( out["stdout"]:"", "\n" ), + ``(size(s)>0)); + y2milestone("running services \"%1\"", sl ); + sl = filter( string s, sl, + ``(!contains( union(ser_ignore,ser_no_restart), s ))); + y2milestone("restarting services \"%1\"", sl ); + cmd = "systemctl --no-block restart " + mergestring( sl, " " ); + y2milestone("before calling \"%1\"", cmd ); + out = (map)SCR::Execute( .target.bash_output, cmd ); + y2milestone("after calling \"%1\"", cmd ); + wait_systemd_finished( max_wait, ser_ignore ); if( need_systemd_isolate ) { logStep( _("Activating systemd default target")); #string cmd = "systemctl disable YaST2-Second-Stage.service; systemctl --ignore-dependencies isolate default.target"; - string cmd = "systemctl --no-block --ignore-dependencies isolate default.target"; + cmd = "systemctl --no-block --ignore-dependencies isolate default.target"; y2milestone("before calling \"%1\"", cmd ); - map out = (map)SCR::Execute( .target.bash_output, cmd ); + out = (map)SCR::Execute( .target.bash_output, cmd ); y2milestone("after calling \"%1\"", cmd ); y2milestone("ret=%1", out ); - integer st_time = time(); - integer cur_time = st_time; - integer last_busy = st_time; - integer max_wait = Profile::current["general","mode","max_systemd_wait"]:30; - list<string> ser_ignore = [ "YaST2-Second-Stage.service", - "autoyast-initscripts.service" ]; - y2milestone("max_wait=%1 ser_ignore=%2", max_wait, ser_ignore ); - cmd = "systemctl --full list-jobs"; - while( (cur_time-st_time)<=max_wait && (cur_time-last_busy)<5 ) - { - out = (map)SCR::Execute( .target.bash_output, cmd ); - y2milestone("ret exit:%1 stderr:%2", out["exit"]:-1, out["stderr"]:"" ); - list<string> sl = splitstring( out["stdout"]:"", "\n" ); - y2milestone("sl=%1", sl ); - list<list> ll = maplist( string s, sl, - ``(filter( string e, - splitstring( s, " \t"), - ``(!isempty(e)) ))); - ll = filter( list l, ll, ``(l[3]:""=="running")); - integer cnt = size( filter( list l, ll, - ``(!contains( ser_ignore, l[1]:"" )))); - y2milestone("size ll=%1 ll:%2", cnt, ll ); - if( cnt>0 ) - last_busy = cur_time; - sleep( 500 ); - cur_time = time(); - y2milestone( "time:%1 idle:%2", cur_time-st_time, cur_time-last_busy ); - } + wait_systemd_finished( max_wait, ser_ignore ); } // Just in case, remove this file to avoid reconfiguring... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/src/dialogs/Makefile.in new/autoyast2-2.24.1/src/dialogs/Makefile.in --- old/autoyast2-2.24.0/src/dialogs/Makefile.in 2013-03-27 14:46:47.000000000 +0100 +++ new/autoyast2-2.24.1/src/dialogs/Makefile.in 2013-04-25 14:56:44.000000000 +0200 @@ -492,7 +492,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/src/include/Makefile.in new/autoyast2-2.24.1/src/include/Makefile.in --- old/autoyast2-2.24.0/src/include/Makefile.in 2013-03-27 14:46:47.000000000 +0100 +++ new/autoyast2-2.24.1/src/include/Makefile.in 2013-04-25 14:56:44.000000000 +0200 @@ -502,7 +502,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/src/include/io.ycp new/autoyast2-2.24.1/src/include/io.ycp --- old/autoyast2-2.24.0/src/include/io.ycp 2013-01-22 13:34:22.000000000 +0100 +++ new/autoyast2-2.24.1/src/include/io.ycp 2013-04-15 16:56:30.000000000 +0200 @@ -15,7 +15,8 @@ import "HTTP"; import "StorageDevices"; import "TFTP"; - import "AutoinstConfig"; + import "AutoinstConfig"; + import "Storage"; string GET_error = ""; @@ -313,17 +314,8 @@ } foreach( string Host, deviceList, ``{ y2milestone("looking for profile on %1", Host); - string mounts = (string)(SCR::Read (.target.string, "/proc/mounts")); - list<string> mount_list = splitstring( mounts, "\n" ); - boolean already_mounted = false; - foreach( string m, mount_list, ``{ - list<string> entries = splitstring( m, " " ); - if( entries[0]:"" == "/dev/"+Host ) { - already_mounted = true; - mount_point = entries[1]:""; - break; - } - }); + mount_point = Storage::DeviceMounted("/dev/"+Host); + boolean already_mounted = !isempty(mount_point); y2milestone("already mounted=%1 mountpoint=%2",already_mounted,mount_point); if( ! already_mounted && !(boolean)SCR::Execute(.target.mount, [sformat("/dev/%1", Host), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/src/modules/Makefile.in new/autoyast2-2.24.1/src/modules/Makefile.in --- old/autoyast2-2.24.0/src/modules/Makefile.in 2013-03-27 14:46:47.000000000 +0100 +++ new/autoyast2-2.24.1/src/modules/Makefile.in 2013-04-25 14:56:44.000000000 +0200 @@ -501,7 +501,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.24.0/src/tests/Makefile.in new/autoyast2-2.24.1/src/tests/Makefile.in --- old/autoyast2-2.24.0/src/tests/Makefile.in 2013-03-27 14:46:47.000000000 +0100 +++ new/autoyast2-2.24.1/src/tests/Makefile.in 2013-04-25 14:56:44.000000000 +0200 @@ -529,7 +529,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org