Hello community,
here is the log from the commit of package autoyast2 for openSUSE:12.3 checked
in at 2013-02-19 13:30:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/autoyast2 (Old)
and /work/SRC/openSUSE:12.3/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2", Maintainer is "f...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.3/autoyast2/autoyast2.changes 2013-02-11
20:44:25.000000000 +0100
+++ /work/SRC/openSUSE:12.3/.autoyast2.new/autoyast2.changes 2013-02-19
13:30:09.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Feb 19 11:44:48 CET 2013 - f...@suse.de
+
+- 2.23.4
+- explicitly call systemctl isolate with default.target to
+ initialize system to default runlevel after second stage
+ package installation and configuration (bnc#769924, bnc#779261)
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.23.3.tar.bz2
New:
----
autoyast2-2.23.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.FWEbb7/_old 2013-02-19 13:30:09.000000000 +0100
+++ /var/tmp/diff_new_pack.FWEbb7/_new 2013-02-19 13:30:09.000000000 +0100
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 2.23.3
+Version: 2.23.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -81,7 +81,7 @@
installation sources.
%package installation
-Version: 2.23.3
+Version: 2.23.4
Release: 0
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
++++++ autoyast2-2.23.3.tar.bz2 -> autoyast2-2.23.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.23.3/VERSION new/autoyast2-2.23.4/VERSION
--- old/autoyast2-2.23.3/VERSION 2013-02-11 17:06:30.000000000 +0100
+++ new/autoyast2-2.23.4/VERSION 2013-02-19 11:51:31.000000000 +0100
@@ -1 +1 @@
-2.23.3
+2.23.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.23.3/configure
new/autoyast2-2.23.4/configure
--- old/autoyast2-2.23.3/configure 2013-02-11 17:06:40.000000000 +0100
+++ new/autoyast2-2.23.4/configure 2013-02-19 12:34:59.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for autoyast2 2.23.3.
+# Generated by GNU Autoconf 2.69 for autoyast2 2.23.4.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.23.3'
-PACKAGE_STRING='autoyast2 2.23.3'
+PACKAGE_VERSION='2.23.4'
+PACKAGE_STRING='autoyast2 2.23.4'
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.23.3 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.23.4 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.23.3:";;
+ short | recursive ) echo "Configuration of autoyast2 2.23.4:";;
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.23.3
+autoyast2 configure 2.23.4
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.23.3, which was
+It was created by autoyast2 $as_me 2.23.4, 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.23.3'
+ VERSION='2.23.4'
cat >>confdefs.h <<_ACEOF
@@ -2477,7 +2477,7 @@
-VERSION="2.23.3"
+VERSION="2.23.4"
RPMNAME="autoyast2"
MAINTAINER="Thomas Fehr <f...@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.23.3, which was
+This file was extended by autoyast2 $as_me 2.23.4, 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.23.3
+autoyast2 config.status 2.23.4
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.23.3/configure.in
new/autoyast2-2.23.4/configure.in
--- old/autoyast2-2.23.3/configure.in 2013-02-11 17:06:37.000000000 +0100
+++ new/autoyast2-2.23.4/configure.in 2013-02-19 12:34:55.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.23.3, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.23.4, 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.23.3"
+VERSION="2.23.4"
RPMNAME="autoyast2"
MAINTAINER="Thomas Fehr <f...@suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.23.3/src/clients/inst_autoconfigure.ycp
new/autoyast2-2.23.4/src/clients/inst_autoconfigure.ycp
--- old/autoyast2-2.23.3/src/clients/inst_autoconfigure.ycp 2013-01-22
13:34:22.000000000 +0100
+++ new/autoyast2-2.23.4/src/clients/inst_autoconfigure.ycp 2013-02-19
11:51:31.000000000 +0100
@@ -38,7 +38,7 @@
current_step = current_step + 1;
UI::ChangeWidget( `id(`progress), `Value, current_step );
UI::ChangeWidget( `id(`log), `LastLine, step_descr + "\n" );
- y2milestone("current step: %1", current_step);
+ y2milestone("current step: %1 desc:%2", current_step, step_descr);
return;
};
@@ -82,9 +82,12 @@
Please wait while the system is being configured.
</p>");
-
- integer max_steps = size(Y2ModuleConfig::ModuleMap) + 3;
- y2milestone("max steps: %1", max_steps);
+ y2milestone("Profile general,mode:%1",
Profile::current["general","mode"]:$[] );
+ boolean need_systemd_isolate = true;
+ integer max_steps = size(Y2ModuleConfig::ModuleMap) + 4;
+ if( need_systemd_isolate )
+ max_steps = max_steps+1;
+ y2milestone("max steps: %1 need_isolate:%2", max_steps,
need_systemd_isolate);
term contents = `VBox(
`LogView(`id(`log), "", 10, 0 ),
@@ -245,6 +248,45 @@
AutoinstScripts::Write("init-scripts", false);
+ 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";
+ y2milestone("before calling \"%1\"", cmd );
+ map 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 );
+ }
+ }
+
// Just in case, remove this file to avoid reconfiguring...
SCR::Execute(.target.remove, "/var/lib/YaST2/runme_at_boot");
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
