mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dracut: remove conf script; we can override settings via kernel cmdline.

Browse Source
This commit is contained in:
Juan RP 2012-11-22 18:27:57 +01:00
parent 5090e85113
commit 9504ed551c
2 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dracut/conf.sh
View File

@ -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

3
dracut/module-setup.sh
View File

@ -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"
}