Hello community,
here is the log from the commit of package yast2-runlevel
checked in at Tue Apr 4 18:18:02 CEST 2006.
--------
--- yast2-runlevel/yast2-runlevel.changes 2006-03-23 09:11:02.000000000 +0100
+++ yast2-runlevel/yast2-runlevel.changes 2006-04-04 14:49:49.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Apr 4 14:47:38 CEST 2006 - locilka@suse.cz
+
+- Preventing from frozen runlevel editor when an init script
+ freezes during the manual start/stop/reread_status using the
+ timeout functionality (#160881).
+- 2.13.7
+
+-------------------------------------------------------------------
Old:
----
yast2-runlevel-2.13.6.tar.bz2
New:
----
yast2-runlevel-2.13.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-runlevel.spec ++++++
--- /var/tmp/diff_new_pack.7wmEUR/_old 2006-04-04 18:17:37.000000000 +0200
+++ /var/tmp/diff_new_pack.7wmEUR/_new 2006-04-04 18:17:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-runlevel (Version 2.13.6)
+# spec file for package yast2-runlevel (Version 2.13.7)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-runlevel
-Version: 2.13.6
+Version: 2.13.7
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-runlevel-2.13.6.tar.bz2
+Source0: yast2-runlevel-2.13.7.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2
@@ -40,7 +40,7 @@
Martin Lazar
%prep
-%setup -n yast2-runlevel-2.13.6
+%setup -n yast2-runlevel-2.13.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -82,6 +82,11 @@
%doc %{prefix}/share/doc/packages/yast2-runlevel
%changelog -n yast2-runlevel
+* Tue Apr 04 2006 - locilka@suse.cz
+- Preventing from frozen runlevel editor when an init script
+ freezes during the manual start/stop/reread_status using the
+ timeout functionality (#160881).
+- 2.13.7
* Thu Mar 23 2006 - locilka@suse.cz
- Added checking for root permissions into the module startup
process (#158483)
++++++ yast2-runlevel-2.13.6.tar.bz2 -> yast2-runlevel-2.13.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.13.6/VERSION new/yast2-runlevel-2.13.7/VERSION
--- old/yast2-runlevel-2.13.6/VERSION 2006-03-23 09:10:30.000000000 +0100
+++ new/yast2-runlevel-2.13.7/VERSION 2006-04-04 14:49:57.000000000 +0200
@@ -1 +1 @@
-2.13.6
+2.13.7
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.13.6/configure new/yast2-runlevel-2.13.7/configure
--- old/yast2-runlevel-2.13.6/configure 2006-03-23 09:13:47.000000000 +0100
+++ new/yast2-runlevel-2.13.7/configure 2006-04-04 14:50:57.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-runlevel 2.13.6.
+# Generated by GNU Autoconf 2.59 for yast2-runlevel 2.13.7.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-runlevel'
PACKAGE_TARNAME='yast2-runlevel'
-PACKAGE_VERSION='2.13.6'
-PACKAGE_STRING='yast2-runlevel 2.13.6'
+PACKAGE_VERSION='2.13.7'
+PACKAGE_STRING='yast2-runlevel 2.13.7'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
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 yast2-runlevel 2.13.6 to adapt to many kinds of systems.
+\`configure' configures yast2-runlevel 2.13.7 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 yast2-runlevel 2.13.6:";;
+ short | recursive ) echo "Configuration of yast2-runlevel 2.13.7:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-runlevel configure 2.13.6
+yast2-runlevel configure 2.13.7
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 yast2-runlevel $as_me 2.13.6, which was
+It was created by yast2-runlevel $as_me 2.13.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-runlevel'
- VERSION='2.13.6'
+ VERSION='2.13.7'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.6"
+VERSION="2.13.7"
RPMNAME="yast2-runlevel"
MAINTAINER="Lukas Ocilka "
@@ -2784,7 +2784,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-runlevel $as_me 2.13.6, which was
+This file was extended by yast2-runlevel $as_me 2.13.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2839,7 +2839,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-runlevel config.status 2.13.6
+yast2-runlevel config.status 2.13.7
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/yast2-runlevel-2.13.6/configure.in new/yast2-runlevel-2.13.7/configure.in
--- old/yast2-runlevel-2.13.6/configure.in 2006-03-23 09:13:44.000000000 +0100
+++ new/yast2-runlevel-2.13.7/configure.in 2006-04-04 14:50:54.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-runlevel, 2.13.6, http://www.suse.de/feedback, yast2-runlevel)
+AC_INIT(yast2-runlevel, 2.13.7, http://www.suse.de/feedback, yast2-runlevel)
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.13.6"
+VERSION="2.13.7"
RPMNAME="yast2-runlevel"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.13.6/src/ui.ycp new/yast2-runlevel-2.13.7/src/ui.ycp
--- old/yast2-runlevel-2.13.6/src/ui.ycp 2006-02-03 08:49:07.000000000 +0100
+++ new/yast2-runlevel-2.13.7/src/ui.ycp 2006-04-04 14:47:34.000000000 +0200
@@ -13,7 +13,7 @@
* Petr Blahos
* Martin Lazar
*
- * $Id: ui.ycp 26800 2006-01-05 09:12:00Z locilka $
+ * $Id: ui.ycp 29655 2006-04-04 12:47:02Z locilka $
*
* Runlevel editor user interface functions.
*/
@@ -26,6 +26,7 @@
import "Wizard";
import "Label";
import "Popup";
+ import "FileUtils";
define string StartedText (integer started);
define string BstatusText (boolean disabled, integer started);
@@ -882,7 +883,17 @@
define list startStopService (string service_name,
string command) ``{
UI::OpenDialog (`Label (service_name + " " + command));
- map out = Service::RunInitScriptOutput (service_name, command);
+ y2milestone("%1 -> %2", service_name, command);
+ string log_filename = sformat("%1/runlevel_out", (string) SCR::Read(.target.tmpdir));
+ integer cmd_run = Service::RunInitScriptWithTimeOut (
+ service_name,
+ command + sformat(" 2>&1 1>%1", log_filename)
+ );
+ map out = $[ "exit" : cmd_run ];
+ if (FileUtils::Exists(log_filename)) {
+ out["stdout"] = (string) SCR::Read(.target.string, log_filename);
+ }
+
UI::CloseDialog ();
integer exit = out["exit"]:-1;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...