[systemd-commits] 3 commits - hwdb/70-pointingstick.hwdb units/systemd-binfmt.service.in units/systemd-hwdb-update.service.in units/systemd-machine-id-commit.service.in units/systemd-modules-load.service.in units/systemd-random-seed.service.in units/systemd-rfkill at .service.in units/systemd-sysctl.service.in units/systemd-sysusers.service.in

Zbigniew Jędrzejewski-Szmek zbyszek at kemper.freedesktop.org
Tue Apr 28 05:54:03 PDT 2015 

 hwdb/70-pointingstick.hwdb                 |   16 +++++++++++-----
 units/systemd-binfmt.service.in            |    1 +
 units/systemd-hwdb-update.service.in       |    1 +
 units/systemd-machine-id-commit.service.in |    1 +
 units/systemd-modules-load.service.in      |    1 +
 units/systemd-random-seed.service.in       |    1 +
 units/systemd-rfkill at .service.in           |    1 +
 units/systemd-sysctl.service.in            |    1 +
 units/systemd-sysusers.service.in          |    1 +
 9 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit b53374f99b619abd90a7c19d69d37a3298b084d5
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Apr 16 21:41:18 2015 -0400

    units: specify timeouts for more oneshot services
    
    Even trivial service occasionally get stuck, for example when
    there's a problem with the journal. There's nothing more annoying
    that looking at the cylon eye for a job with an infinite timeout.
    
    Use standard 90s for jobs that do some work, and 30s for those which
    should be almost instantenous.

diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
index 34a5d52..d53073e 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -24,3 +24,4 @@ ConditionDirectoryNotEmpty=|/run/binfmt.d
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-binfmt
+TimeoutSec=90s
diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in
index 791528e..7135cff 100644
--- a/units/systemd-hwdb-update.service.in
+++ b/units/systemd-hwdb-update.service.in
@@ -21,3 +21,4 @@ ConditionDirectoryNotEmpty=|/etc/udev/hwdb.d/
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootbindir@/systemd-hwdb update
+TimeoutSec=90s
diff --git a/units/systemd-machine-id-commit.service.in b/units/systemd-machine-id-commit.service.in
index dd765b6..cccbf7b 100644
--- a/units/systemd-machine-id-commit.service.in
+++ b/units/systemd-machine-id-commit.service.in
@@ -19,3 +19,4 @@ ConditionPathIsMountPoint=/etc/machine-id
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-machine-id-commit
+TimeoutSec=30s
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 040a0fe..9de6d31 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -24,3 +24,4 @@ ConditionKernelCommandLine=|rd.modules-load
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-modules-load
+TimeoutSec=90s
diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in
index b55844b..1152332 100644
--- a/units/systemd-random-seed.service.in
+++ b/units/systemd-random-seed.service.in
@@ -19,3 +19,4 @@ Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-random-seed load
 ExecStop=@rootlibexecdir@/systemd-random-seed save
+TimeoutSec=30s
diff --git a/units/systemd-rfkill at .service.in b/units/systemd-rfkill at .service.in
index b48efe5..e53bf5f 100644
--- a/units/systemd-rfkill at .service.in
+++ b/units/systemd-rfkill at .service.in
@@ -20,3 +20,4 @@ Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-rfkill load %I
 ExecStop=@rootlibexecdir@/systemd-rfkill save %I
+TimeoutSec=30s
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index fa72085..d784c64 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -18,3 +18,4 @@ ConditionPathIsReadWrite=/proc/sys/
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-sysctl
+TimeoutSec=90s
diff --git a/units/systemd-sysusers.service.in b/units/systemd-sysusers.service.in
index ffd6d77..4d8309a 100644
--- a/units/systemd-sysusers.service.in
+++ b/units/systemd-sysusers.service.in
@@ -18,3 +18,4 @@ ConditionNeedsUpdate=/etc
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootbindir@/systemd-sysusers
+TimeoutSec=90s

commit ea35a386133b7998e9419a666c36bf38433c4b5c
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Apr 28 08:45:02 2015 -0400

    hwdb: coalesce same pointingstick entries into one
    
    Multiple models in the same hardware series are likely to have similar
    specs. We should use organization similar to hwdb/60-evdev.

diff --git a/hwdb/70-pointingstick.hwdb b/hwdb/70-pointingstick.hwdb
index f18b6d4..72c1a3b 100644
--- a/hwdb/70-pointingstick.hwdb
+++ b/hwdb/70-pointingstick.hwdb
@@ -43,6 +43,8 @@
 #   POINTINGSTICK_CONST_ACCEL
 #   POINTINGSTICK_SENSITIVITY
 #
+# Entries should be sorted with growing _SENSITIVITY and _CONST_ACCEL.
+#
 #########################################
 #      POINTINGSTICK_CONST_ACCEL        #
 #########################################
@@ -85,25 +87,19 @@ evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE6400*:pvr*
 # Lenovo
 #########################################
 
-# Lenovo Thinkpad X200s / X201s
-# Note these come with 2 revisions of keyboard, with the trackpoints having a
-# different sensitivity in the different revisions. 1.25 is a bit slow for the
-# least sensitive revision, but it is better to be a bit slow than too fast.
-evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX20?s:*
-  POINTINGSTICK_SENSITIVITY=200
-  POINTINGSTICK_CONST_ACCEL=1.25
-
 # Lenovo Thinkpad X240
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX240:*
-  POINTINGSTICK_SENSITIVITY=200
-  POINTINGSTICK_CONST_ACCEL=1.0
-
 # Lenovo Thinkpad T440s
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT440s:*
-  POINTINGSTICK_SENSITIVITY=200
-  POINTINGSTICK_CONST_ACCEL=1.0
-
 # Lenovo Thinkpad T540p
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT540p:*
   POINTINGSTICK_SENSITIVITY=200
   POINTINGSTICK_CONST_ACCEL=1.0
+
+# Lenovo Thinkpad X200s / X201s
+# Note these come with 2 revisions of keyboard, with the trackpoints having a
+# different sensitivity in the different revisions. 1.25 is a bit slow for the
+# least sensitive revision, but it is better to be a bit slow than too fast.
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX20?s:*
+  POINTINGSTICK_SENSITIVITY=200
+  POINTINGSTICK_CONST_ACCEL=1.25

commit 151f5feb31bb83bf5e9e8c4d138268f07e25e716
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Apr 28 11:07:42 2015 +0200

    udev: hwdb: Add trackpoint sensitivity settings for Lenovo X240 and 540p
    
    Like the T440s these need the sensitity to be set significantly higher
    then the default of 128 for the trackpoint to be usable. Like with the
    T440s 200 seems to be a good value to get a reasonable but not too high
    sensitivity.

diff --git a/hwdb/70-pointingstick.hwdb b/hwdb/70-pointingstick.hwdb
index 8d210f9..f18b6d4 100644
--- a/hwdb/70-pointingstick.hwdb
+++ b/hwdb/70-pointingstick.hwdb
@@ -93,7 +93,17 @@ evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX20?
   POINTINGSTICK_SENSITIVITY=200
   POINTINGSTICK_CONST_ACCEL=1.25
 
+# Lenovo Thinkpad X240
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX240:*
+  POINTINGSTICK_SENSITIVITY=200
+  POINTINGSTICK_CONST_ACCEL=1.0
+
 # Lenovo Thinkpad T440s
 evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT440s:*
   POINTINGSTICK_SENSITIVITY=200
   POINTINGSTICK_CONST_ACCEL=1.0
+
+# Lenovo Thinkpad T540p
+evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadT540p:*
+  POINTINGSTICK_SENSITIVITY=200
+  POINTINGSTICK_CONST_ACCEL=1.0

More information about the systemd-commits mailing list