installer: Let dracut initialize the console

This won't fix the outstanding issue with broken locales and encoding,
but rather tidies up some code.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/installer/dracut-module/module-setup.sh b/src/installer/dracut-module/module-setup.sh
index 6c665eb83fef6490f8d73453b5fd1615799b29fe..e63053eaf5af7255d877ff0c4cad1e8cc42ad0a4 100755 (executable)
--- a/src/installer/dracut-module/module-setup.sh
+++ b/src/installer/dracut-module/module-setup.sh
@@ -9,7 +9,7 @@ check() {
 
 # called by dracut
 depends() {
-    echo base bash drm mdraid shutdown
+    echo base bash drm i18n mdraid shutdown
     return 0
 }
 

diff --git a/src/installer/dracut-module/run-installer.sh b/src/installer/dracut-module/run-installer.sh
index 7a50920e7631b42b30c12f0bc09d0fd7a29e0ea6..d0eebc61a28dea2a0f7380415bddbb4d03d18dda 100644 (file)
--- a/src/installer/dracut-module/run-installer.sh
+++ b/src/installer/dracut-module/run-installer.sh
@@ -16,12 +16,6 @@ if [ -d "/sys/firmware/efi" ]; then
        mount -t efivarfs efivarfs /sys/firmware/efi/efivars
 fi
 
-# Enable Unicode
-echo -en '\033%G' && kbd_mode -u
-
-# Load default console font
-setfont latarcyrheb-sun16
-
 # Silence the kernel
 echo >/proc/sys/kernel/printk "1 4 1 7"
 echo -n -e "\033[9;0]"