wok-6.x rev 13555

xorg-xf86-input-evdev: move XkbOptions from 40-evdev.conf to 40-Keyboard.conf (slitaz-tools/tinyutils/tazx)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Nov 03 02:15:27 2012 +0000 (2012-11-03)
parents 49a0fd9e6d09
children a61559756120
files sudo-pam/stuff/etc/pam.d/sudo sudo-pam/stuff/etc/security/limits.conf xorg-xf86-input-evdev/stuff/40-evdev.conf
line diff
     1.1 --- a/sudo-pam/stuff/etc/pam.d/sudo	Fri Nov 02 19:32:40 2012 +0000
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,7 +0,0 @@
     1.4 -#%PAM-1.0
     1.5 -# specify the PAM fallback behaviour
     1.6 -
     1.7 -auth	required	pam_unix.so
     1.8 -account	required	pam_unix.so
     1.9 -password	required	pam_unix.so md5
    1.10 -session	required	pam_limits.so
     2.1 --- a/sudo-pam/stuff/etc/security/limits.conf	Fri Nov 02 19:32:40 2012 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,53 +0,0 @@
     2.4 -# /etc/security/limits.conf
     2.5 -#
     2.6 -#Each line describes a limit for a user in the form:
     2.7 -#
     2.8 -#<domain>        <type>  <item>  <value>
     2.9 -#
    2.10 -#Where:
    2.11 -#<domain> can be:
    2.12 -#        - an user name
    2.13 -#        - a group name, with @group syntax
    2.14 -#        - the wildcard *, for default entry
    2.15 -#        - the wildcard %, can be also used with %group syntax,
    2.16 -#                 for maxlogin limit
    2.17 -#
    2.18 -#<type> can have the two values:
    2.19 -#        - "soft" for enforcing the soft limits
    2.20 -#        - "hard" for enforcing hard limits
    2.21 -#
    2.22 -#<item> can be one of the following:
    2.23 -#        - core - limits the core file size (KB)
    2.24 -#        - data - max data size (KB)
    2.25 -#        - fsize - maximum filesize (KB)
    2.26 -#        - memlock - max locked-in-memory address space (KB)
    2.27 -#        - nofile - max number of open files
    2.28 -#        - rss - max resident set size (KB)
    2.29 -#        - stack - max stack size (KB)
    2.30 -#        - cpu - max CPU time (MIN)
    2.31 -#        - nproc - max number of processes
    2.32 -#        - as - address space limit (KB)
    2.33 -#        - maxlogins - max number of logins for this user
    2.34 -#        - maxsyslogins - max number of logins on the system
    2.35 -#        - priority - the priority to run user process with
    2.36 -#        - locks - max number of file locks the user can hold
    2.37 -#        - sigpending - max number of pending signals
    2.38 -#        - msgqueue - max memory used by POSIX message queues (bytes)
    2.39 -#        - nice - max nice priority allowed to raise to values: [-20, 19]
    2.40 -#        - rtprio - max realtime priority
    2.41 -#
    2.42 -#<domain>      <type>  <item>         <value>
    2.43 -#
    2.44 -
    2.45 -#*               soft    core            0
    2.46 -#*               hard    rss             10000
    2.47 -#@student        hard    nproc           20
    2.48 -#@faculty        soft    nproc           20
    2.49 -#@faculty        hard    nproc           50
    2.50 -#ftp             hard    nproc           0
    2.51 -#@student        -       maxlogins       4
    2.52 -@audio - rtprio 90
    2.53 -@audio - memlock unlimited
    2.54 -@audio - nice -10
    2.55 -
    2.56 -# End of file
     3.1 --- a/xorg-xf86-input-evdev/stuff/40-evdev.conf	Fri Nov 02 19:32:40 2012 +0000
     3.2 +++ b/xorg-xf86-input-evdev/stuff/40-evdev.conf	Sat Nov 03 02:15:27 2012 +0000
     3.3 @@ -4,52 +4,51 @@
     3.4  # matches everything.
     3.5  
     3.6  Section "InputClass"
     3.7 -        Identifier "evdev pointer catchall"
     3.8 -        MatchIsPointer "on"
     3.9 -        MatchDevicePath "/dev/input/event*"
    3.10 -        Driver "evdev"
    3.11 +	Identifier "evdev pointer catchall"
    3.12 +	MatchIsPointer "on"
    3.13 +	MatchDevicePath "/dev/input/event*"
    3.14 +	Driver "evdev"
    3.15  EndSection
    3.16  
    3.17  Section "InputClass"
    3.18 -        Identifier "evdev keyboard catchall"
    3.19 -        MatchIsKeyboard "on"
    3.20 -        MatchDevicePath "/dev/input/event*"
    3.21 -        Driver "evdev"
    3.22 -	Option "XkbOptions" "terminate:ctrl_alt_bksp"
    3.23 +	Identifier "evdev keyboard catchall"
    3.24 +	MatchIsKeyboard "on"
    3.25 +	MatchDevicePath "/dev/input/event*"
    3.26 +	Driver "evdev"
    3.27  EndSection
    3.28  
    3.29  Section "InputClass"
    3.30 -        Identifier "evdev touchpad catchall"
    3.31 -        MatchIsTouchpad "on"
    3.32 -        MatchDevicePath "/dev/input/event*"
    3.33 -        Driver "evdev"
    3.34 +	Identifier "evdev touchpad catchall"
    3.35 +	MatchIsTouchpad "on"
    3.36 +	MatchDevicePath "/dev/input/event*"
    3.37 +	Driver "evdev"
    3.38  EndSection
    3.39  
    3.40  Section "InputClass"
    3.41 -        Identifier "evdev tablet catchall"
    3.42 -        MatchIsTablet "on"
    3.43 -        MatchDevicePath "/dev/input/event*"
    3.44 -        Driver "evdev"
    3.45 +	Identifier "evdev tablet catchall"
    3.46 +	MatchIsTablet "on"
    3.47 +	MatchDevicePath "/dev/input/event*"
    3.48 +	Driver "evdev"
    3.49  EndSection
    3.50  
    3.51  Section "InputClass"
    3.52 -        Identifier "evdev touchscreen catchall"
    3.53 -        MatchIsTouchscreen "on"
    3.54 -        MatchDevicePath "/dev/input/event*"
    3.55 -        Driver "evdev"
    3.56 +	Identifier "evdev touchscreen catchall"
    3.57 +	MatchIsTouchscreen "on"
    3.58 +	MatchDevicePath "/dev/input/event*"
    3.59 +	Driver "evdev"
    3.60  EndSection
    3.61  
    3.62  Section "InputClass"
    3.63 -        Identifier "evdev joystick catchall"
    3.64 -        MatchIsJoystick "on"
    3.65 -        MatchDevicePath "/dev/input/event*"
    3.66 -        Driver "evdev"
    3.67 +	Identifier "evdev joystick catchall"
    3.68 +	MatchIsJoystick "on"
    3.69 +	MatchDevicePath "/dev/input/event*"
    3.70 +	Driver "evdev"
    3.71  EndSection
    3.72  
    3.73  # Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
    3.74  # http://bugs.freedesktop.org/show_bug.cgi?id=22442 
    3.75  Section "InputClass"
    3.76 -        Identifier "ThinkPad HDAPS accelerometer blacklist"
    3.77 -        MatchProduct "ThinkPad HDAPS accelerometer data"
    3.78 -        Option "Ignore" "on"
    3.79 +	Identifier "ThinkPad HDAPS accelerometer blacklist"
    3.80 +	MatchProduct "ThinkPad HDAPS accelerometer data"
    3.81 +	Option "Ignore" "on"
    3.82  EndSection