From 9504ed551c18eb8276e3e0788eb0a285d1257795 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 22 Nov 2012 18:27:57 +0100
Subject: dracut: remove conf script; we can override settings via kernel
 cmdline.

---
 dracut/conf.sh         | 33 ---------------------------------
 dracut/module-setup.sh |  3 +--
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 dracut/conf.sh

diff --git a/dracut/conf.sh b/dracut/conf.sh
deleted file mode 100644
index bb63e61..0000000
--- a/dracut/conf.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-
-KEYMAP=$(getarg vconsole.keymap)
-FONT=$(getarg vconsole.font)
-FONT_MAP=$(getarg vconsole.font.map)
-FONT_UNIMAP=$(getarg vconsole.font.unimap)
-LOCALE=$(getarg locale.LANG)
-
-if [ -n "$KEYMAP" ]; then
-    sed -i -e "s|^KEYMAP=.*|KEYMAP=$KEYMAP|g" ${NEWROOT}/etc/vconsole.conf
-fi
-if [ -n "$FONT" ]; then
-    sed -i -e "s|^FONT=.*|FONT=$FONT|g" ${NEWROOT}/etc/vconsole.conf
-fi
-if [ -n "$FONT_MAP" ]; then
-    sed -i -e "s|^FONT_MAP=.*|FONT_MAP=$FONT_MAP|g" ${NEWROOT}/etc/vconsole.conf
-fi
-if [ -n "$FONT_UNIMAP" ]; then
-    sed -i -e "s|^FONT_UNIMAP=.*|FONT_UNIMAP=$FONT_UNIMAP|g" ${NEWROOT}/etc/vconsole.conf
-fi
-if [ -n "$LOCALE" ]; then
-    sed -i -e "s|^LANG=.*|LANG=$LOCALE|g" ${NEWROOT}/etc/locale.conf
-fi
-
-# Setup keymap for X.org evdev.
-if [ -r "${NEWROOT}/etc/udev/rules.d/75-x11-input.rules" ]; then
-    sed -i -e "s|\(ENV{xkblayout}\=\)\"us\"|\1\"${KEYMAP}\"|" \
-        ${NEWROOT}/etc/udev/rules.d/75-x11-input.rules
-fi
diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh
index 48db546..488f82b 100644
--- a/dracut/module-setup.sh
+++ b/dracut/module-setup.sh
@@ -14,6 +14,5 @@ install() {
     inst /usr/bin/chmod
     inst /usr/bin/sed
     inst_hook pre-pivot 01 "$moddir/adduser.sh"
-    inst_hook pre-pivot 02 "$moddir/conf.sh"
-    inst_hook pre-pivot 03 "$moddir/display-manager-autologin.sh"
+    inst_hook pre-pivot 02 "$moddir/display-manager-autologin.sh"
 }
-- 
cgit 1.4.1