Browse Source

Don't use /etc/vconsole.conf after all as it's not used anywhere in debian

It makes little sense
tags/devuan/0.9.5
Laurent Bigonville 7 months ago
parent
commit
4bb9046c02
2 changed files with 13 additions and 18 deletions
  1. +1
    -6
      debian/local/plymouth.hook
  2. +12
    -12
      debian/patches/fallback-etc-default-keyboard.patch

+ 1
- 6
debian/local/plymouth.hook View File

@@ -121,17 +121,12 @@ case "${THEME_NAME}" in
esac
fc-cache -s -y "${DESTDIR}" > /dev/null 2>&1

# copy /etc/default/keyboard and /etc/vconsole.conf (needed for keymap detection)
# copy /etc/default/keyboard (needed for keymap detection)
if [ -e /etc/default/keyboard ]
then
mkdir -p "${DESTDIR}/etc/default"
cp /etc/default/keyboard "${DESTDIR}/etc/default"
fi
if [ -e /etc/vconsole.conf ]
then
mkdir -p "${DESTDIR}/etc"
cp /etc/vconsole.conf "${DESTDIR}/etc"
fi

# for two-step
case "$(sed -n 's/^ModuleName=\(.*\)/\1/p' ${THEME})" in


+ 12
- 12
debian/patches/fallback-etc-default-keyboard.patch View File

@@ -1,17 +1,17 @@
Description: Use /etc/default/keyboard instead of /etc/vconsole.conf
Forwarded: not-needed

--- a/src/libply-splash-core/ply-terminal.c
+++ b/src/libply-splash-core/ply-terminal.c
@@ -136,6 +136,14 @@ ply_terminal_parse_keymap_conf (ply_term
keymap = ply_key_file_get_value (vconsole_conf, NULL, "KEYMAP");
@@ -131,9 +131,9 @@ ply_terminal_parse_keymap_conf (ply_term
if (keymap)
return keymap;
- vconsole_conf = ply_key_file_new ("/etc/vconsole.conf");
+ vconsole_conf = ply_key_file_new ("/etc/default/keyboard");
if (ply_key_file_load_groupless_file (vconsole_conf))
- keymap = ply_key_file_get_value (vconsole_conf, NULL, "KEYMAP");
+ keymap = ply_key_file_get_value (vconsole_conf, NULL, "XKBLAYOUT");
ply_key_file_free (vconsole_conf);
+ /* Fallback to the debian specific keyboard configuration file */
+ if (!keymap) {
+ vconsole_conf = ply_key_file_new ("/etc/default/keyboard");
+ if (ply_key_file_load_groupless_file (vconsole_conf))
+ keymap = ply_key_file_get_value (vconsole_conf, NULL, "XKBLAYOUT");
+ ply_key_file_free (vconsole_conf);
+ }
+
/* The keymap name in vconsole.conf might be quoted, strip these */
if (keymap && keymap[0] == '"' && keymap[strlen (keymap) - 1] == '"') {
old_keymap = keymap;

Loading…
Cancel
Save