0732ef7acf
Before, X11 keymap fr-pc105-oss would be converted to fr,
even though fr-oss exists. Now, if
/usr/lib/kbd/keymaps/xkb/<layout>[-<variant>].map[.gz] exists,
<layout>[-<variant>] will be used as the console keymap,
falling back to the legacy mappings otherwise.
% sudo localectl set-x11-keymap pl pc105
% localectl
System Locale: LANG=en_US.UTF-8
VC Keymap: pl (was pl2 before)
X11 Layout: pl
X11 Model: pc105
% sudo localectl set-x11-keymap fr pc105 oss
% localectl
System Locale: LANG=en_US.UTF-8
VC Keymap: fr-oss (was fr before)
X11 Layout: fr
X11 Model: pc105
X11 Variant: oss
% sudo localectl set-x11-keymap fr pc105
% localectl
System Locale: LANG=en_US.UTF-8
VC Keymap: fr
X11 Layout: fr
X11 Model: pc105
% sudo localectl set-x11-keymap gb
% localectl
System Locale: LANG=en_US.UTF-8
VC Keymap: gb (was uk before)
X11 Layout: gb
59 lines
1.9 KiB
C
59 lines
1.9 KiB
C
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
|
|
|
#pragma once
|
|
|
|
/***
|
|
This file is part of systemd.
|
|
|
|
Copyright 2010 Lennart Poettering
|
|
|
|
systemd is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU Lesser General Public License as published by
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
|
(at your option) any later version.
|
|
|
|
systemd is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
#include "util.h"
|
|
|
|
#define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC)
|
|
#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
|
|
#define DEFAULT_CONFIRM_USEC (30*USEC_PER_SEC)
|
|
|
|
#define DEFAULT_START_LIMIT_INTERVAL (10*USEC_PER_SEC)
|
|
#define DEFAULT_START_LIMIT_BURST 5
|
|
|
|
#define DEFAULT_EXIT_USEC (5*USEC_PER_MINUTE)
|
|
|
|
#define SYSTEMD_CGROUP_CONTROLLER "name=systemd"
|
|
|
|
#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
|
|
#define SIGNALS_IGNORE SIGPIPE
|
|
|
|
#define DIGITS "0123456789"
|
|
#define LOWERCASE_LETTERS "abcdefghijklmnopqrstuvwxyz"
|
|
#define UPPERCASE_LETTERS "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
|
#define LETTERS LOWERCASE_LETTERS UPPERCASE_LETTERS
|
|
|
|
#define REBOOT_PARAM_FILE "/run/systemd/reboot-param"
|
|
|
|
#ifdef HAVE_SPLIT_USR
|
|
#define KBD_KEYMAP_DIRS \
|
|
"/usr/share/keymaps/\0" \
|
|
"/usr/share/kbd/keymaps/\0" \
|
|
"/usr/lib/kbd/keymaps/\0" \
|
|
"/lib/kbd/keymaps/\0"
|
|
#else
|
|
#define KBD_KEYMAP_DIRS \
|
|
"/usr/share/keymaps/\0" \
|
|
"/usr/share/kbd/keymaps/\0" \
|
|
"/usr/lib/kbd/keymaps/\0"
|
|
#endif
|