Accepting request 128596 from Base:System

- Fix NumLock detection/set race condition (bnc#746595#c47). (forwarded request 128498 from sbrabec)

OBS-URL: https://build.opensuse.org/request/show/128596
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=107
This commit is contained in:
Stephan Kulow 2012-07-23 08:41:36 +00:00 committed by Git OBS Bridge
commit ba15e0cdce
2 changed files with 19 additions and 1 deletions

View File

@ -165,7 +165,7 @@ Index: systemd-44/configure.ac
D-Bus policy dir: ${with_dbuspolicydir} D-Bus policy dir: ${with_dbuspolicydir}
D-Bus session dir: ${with_dbussessionservicedir} D-Bus session dir: ${with_dbussessionservicedir}
D-Bus system dir: ${with_dbussystemservicedir} D-Bus system dir: ${with_dbussystemservicedir}
Index: systemd-44/src/login/73-seat-numlock.rules.in Index: systemd-44/src/login/73-seat-numlock.rules
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ systemd-44/src/login/73-seat-numlock.rules +++ systemd-44/src/login/73-seat-numlock.rules
@ -219,3 +219,16 @@ Index: systemd-44/src/login/numlock-on.c
+ return EX_IOERR; + return EX_IOERR;
+ return execv(args[0], args); + return execv(args[0], args);
+} +}
Index: systemd-44/units/systemd-vconsole-setup.service.in
===================================================================
--- systemd-44.orig/units/systemd-vconsole-setup.service.in
+++ systemd-44/units/systemd-vconsole-setup.service.in
@@ -10,7 +10,7 @@ Description=Setup Virtual Console
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=sysinit.target shutdown.target
+Before=sysinit.target shutdown.target udev-trigger.service
[Service]
Type=oneshot

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 20 19:24:08 CEST 2012 - sbrabec@suse.cz
- Fix NumLock detection/set race condition (bnc#746595#c47).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 18 13:14:37 UTC 2012 - fcrozat@suse.com Wed Jul 18 13:14:37 UTC 2012 - fcrozat@suse.com