From 353e6d05dc2a7f76f6ecbf4c3581d2c145d5d34c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 9 Oct 2014 09:59:17 +0200
Subject: core-services: run console-setup before filesystems, for LUKS setups.

... otherwise the keymap is not properly setup when entering LUKS
passwords. Reported by freds0n.
---
 core-services/02-console-setup.sh | 15 +++++++++++++++
 core-services/06-console-setup.sh | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 core-services/02-console-setup.sh
 delete mode 100644 core-services/06-console-setup.sh

(limited to 'core-services')

diff --git a/core-services/02-console-setup.sh b/core-services/02-console-setup.sh
new file mode 100644
index 0000000..4077f48
--- /dev/null
+++ b/core-services/02-console-setup.sh
@@ -0,0 +1,15 @@
+# vim: set ts=4 sw=4 et:
+
+[ -n "$VIRTUALIZATION" ] && return 0
+
+if [ -n "$FONT" ]; then
+    msg "Setting up TTYs font to '${FONT}'...\n"
+    for i in /dev/tty[0-6]; do
+        setfont ${FONT_MAP:+-m $FONT_MAP} ${FONT_UNIMAP:+-u $FONT_UNIMAP} $FONT -C $i
+    done
+fi
+
+if [ -n "$KEYMAP" ]; then
+    msg "Setting up keymap to '${KEYMAP}'...\n"
+    loadkeys -q -u ${KEYMAP}
+fi
diff --git a/core-services/06-console-setup.sh b/core-services/06-console-setup.sh
deleted file mode 100644
index 4077f48..0000000
--- a/core-services/06-console-setup.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-# vim: set ts=4 sw=4 et:
-
-[ -n "$VIRTUALIZATION" ] && return 0
-
-if [ -n "$FONT" ]; then
-    msg "Setting up TTYs font to '${FONT}'...\n"
-    for i in /dev/tty[0-6]; do
-        setfont ${FONT_MAP:+-m $FONT_MAP} ${FONT_UNIMAP:+-u $FONT_UNIMAP} $FONT -C $i
-    done
-fi
-
-if [ -n "$KEYMAP" ]; then
-    msg "Setting up keymap to '${KEYMAP}'...\n"
-    loadkeys -q -u ${KEYMAP}
-fi
-- 
cgit 1.4.1