[systemd-commits] 2 commits - man/journald.conf.xml src/udev

[Zbigniew Jędrzejewski-Szmek]

 man/journald.conf.xml           |    5 +++--
 src/udev/keymap/95-keymap.rules |    4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit f3dbb13c8535882be9de14d1cf2b0656c96c89bb
Author: Pierre Neidhardt <ambrevar at gmail.com>
Date:   Tue Jun 4 17:32:33 2013 -0400

    keymap: add some more Asus laptop keys
    
    With Linux 3.9 (commit a935eaecef2b209ad661dadabb4e32b7c9a9b924), the
    Asus keyboard driver has changed to be more compliant to the symbol
    signification. This has led to some issues with udev. In particular,
    the XF86TouchpadToggle (a Fn key) does not work anymore on Asus X52J.
    
    I found another similar patch which does not seem to have been ever
    submitted/merged:
    
      https://launchpadlibrarian.net/73337842/95-keymap.rules.patch
    
    Find enclosed the patch containing both the launchpad patch and mine
    into one file.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=65375

diff --git a/src/udev/keymap/95-keymap.rules b/src/udev/keymap/95-keymap.rules
index 994950c..18816f1 100644
--- a/src/udev/keymap/95-keymap.rules
+++ b/src/udev/keymap/95-keymap.rules
@@ -49,6 +49,10 @@ ENV{DMI_VENDOR}=="LENOVO*", KERNELS=="input*", ATTRS{name}=="Lenovo ThinkPad SL
 ENV{DMI_VENDOR}=="LENOVO*", KERNELS=="input*", ATTRS{name}=="Ideapad extra buttons", RUN+="keymap $name 0x42 f23 0x43 f22"
 
 ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Extra Buttons", ATTR{[dmi/id]product_name}=="W3J", RUN+="keymap $name module-asus-w3j"
+ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Laptop extra buttons", RUN+="keymap $name 0x6B f21"
+ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Laptop Support", RUN+="keymap $name 0x6B f21"
+ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus WMI hotkeys", RUN+="keymap $name 0x6B f21"
+ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Notebooks WMI Hotkey Driver", RUN+="keymap $name 0x6B f21"
 ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Eee PC WMI hotkeys|Asus Laptop Support|Asus*WMI*", RUN+="keymap $name 0x6B f21"
 ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Eee PC Hotkey Driver", RUN+="keymap $name 0x37 f21"
 

commit bdf874d4bfd0292e8240418930fac568134389d2
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Jun 4 17:44:23 2013 -0400

    man: mention that units are 1024-based

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 6d54c94..fe47fdf 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -263,8 +263,9 @@
                                 that usually seven rotated journal
                                 files are kept as history. Specify
                                 values in bytes or use K, M, G, T, P,
-                                E as units for the specified
-                                sizes. Note that size limits are
+                                E as units for the specified sizes
+                                (equal to 1024, 1024²,... bytes).
+                                Note that size limits are
                                 enforced synchronously to journal
                                 files as they are extended, and need
                                 no explicit rotation step triggered by