From 4188ff4ed6139c6acd3e3654df18b14e87f02c9e4558d6d515222ed062a28b91 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 1 Mar 2012 09:50:56 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=167 --- showconsole-1.16.dif | 23 +++++++++++++++++++---- sysvinit.changes | 6 ++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/showconsole-1.16.dif b/showconsole-1.16.dif index f62ea04..5928dcf 100644 --- a/showconsole-1.16.dif +++ b/showconsole-1.16.dif @@ -1,4 +1,19 @@ ---- .#empty -+++ .#empty 2012-01-30 17:44:30.343145442 +0000 -@@ -0,0 +1 @@ -+Place holder +--- libconsole.c ++++ libconsole.c 2012-03-01 09:49:44.493932912 +0000 +@@ -902,16 +902,6 @@ void safeIO (void) + #ifdef DEBUG_SIGIO + if (nsigio < 0) + goto skip; +-#else +- if (nsigio < 0) { +- /* +- * Maybe access() does lie under kernel 2.6 +- * or the root file system is rw mounted +- */ +- const char *runlevel = getenv("RUNLEVEL"); +- if (runlevel && (*runlevel < '0' || *runlevel > '6')) +- goto skip; +- } + #endif + if (access(BOOT_LOGFILE, W_OK) < 0) { + if (errno != ENOENT && errno != EROFS) diff --git a/sysvinit.changes b/sysvinit.changes index 2b51463..f07dfaa 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -3,6 +3,12 @@ Wed Feb 8 12:35:24 UTC 2012 - werner@suse.de - Work around dully check script of obs +------------------------------------------------------------------- +Wed Feb 1 12:01:05 UTC 2012 - werner@suse.de + +- Avoid useless check for runlevel as access(2) now works on + kernel 3.0 and above, this fixes bnc#744538 + ------------------------------------------------------------------- Tue Jan 31 16:40:18 UTC 2012 - werner@suse.de