Signed-off-by: Dave Reisner
---
install/consolefont | 9 ++-------
install/keymap | 5 ++---
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/install/consolefont b/install/consolefont
index 0bb1af6..bbcd7ec 100644
--- a/install/consolefont
+++ b/install/consolefont
@@ -3,11 +3,7 @@
build() {
# subshell to avoid namespace pollution
(
- for cfg in /etc/{rc,vconsole}.conf; do
- [[ -s $cfg ]] && . "$cfg"
- done
-
- [[ $FONT ]] && CONSOLEFONT=$FONT
+ [[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf
if [[ $CONSOLEFONT ]]; then
for file in "/usr/share/kbd/consolefonts/$CONSOLEFONT".@(fnt|psf?(u))?(.gz); do
@@ -32,8 +28,7 @@ build() {
help() {
cat <