Hello community,

here is the log from the commit of package sysvinit for openSUSE:Factory 
checked in at 2014-02-11 10:59:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
 and      /work/SRC/openSUSE:Factory/.sysvinit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "sysvinit"

Changes:
--------
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes        2014-01-29 
07:17:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes   2014-02-11 
10:59:16.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb  7 15:42:34 UTC 2014 - [email protected]
+
+- Add patch sysvinit-2.88+dsf-xen.patch to enable sulogin to find
+  suitable console device even if first is not usable (bnc#862078)
+
+-------------------------------------------------------------------

New:
----
  sysvinit-2.88+dsf-xen.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sysvinit.spec ++++++
--- /var/tmp/diff_new_pack.M186av/_old  2014-02-11 10:59:16.000000000 +0100
+++ /var/tmp/diff_new_pack.M186av/_new  2014-02-11 10:59:16.000000000 +0100
@@ -70,6 +70,8 @@
 Patch11:        %{name}-%{version}dsf-dostat.patch
 # PATCH-FIX-UPSTREAM -- killall5: handle strange names of executables
 Patch12:        %{name}-%{version}dsf-sulogin.diff
+# PATCH-FIX-SUSE -- sulogin: find suitable console device even if first is not 
usable
+Patch13:        %{name}-%{version}dsf-xen.patch
 Patch30:        killproc-%{KPVER}.dif
 Patch40:        showconsole-%{SCVER}.dif
 Patch41:        showconsole-1.16-deadlock.diff
@@ -134,6 +136,7 @@
 %patch10 -p0 -b .env
 %patch11 -p0 -b .dostat
 %patch12 -p0 -b .ka5
+%patch13 -p0 -b .xen
 %patch
 pushd doc
   mkdir killproc showconsole

++++++ sysvinit-2.88+dsf-xen.patch ++++++
--- src/consoles.c
+++ src/consoles.c      2014-02-07 15:33:15.786235493 +0000
@@ -313,16 +313,19 @@ console:
         */
        if ((fc = fopen("/proc/consoles", "re"))) {
                char fbuf[16];
-               int maj, min;
+               int maj, min, matches;
                DIR *dir;
                dir = opendir("/dev");
                if (!dir) {
                        fclose(fc);
                        goto fallback;
                }
-               while ((fscanf(fc, "%*s %*s (%[^)]) %d:%d", &fbuf[0], &maj, 
&min) == 3)) {
+               while ((matches = fscanf(fc, "%*s %*s (%[^)]) %d:%d", &fbuf[0], 
&maj, &min)) >= 1) {
                        char * name;
 
+                       if (matches != 3)
+                               continue;
+
                        if (!strchr(fbuf, 'E'))
                                continue;
                        comparedev = makedev(maj, min);
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to