X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=637f2381fa78d2de8dc66aee6b0d4e15930e71a6;hp=4d13248e72dc1d842636628ecf0a0709c35d275b;hb=2e0338e5b686bfaaecd58d257f590042fdb09b21;hpb=108abd3aa30fc3e9072d46e2aca2af0aa119e8f8

diff --git a/autoconfig.functions b/autoconfig.functions
index 4d13248..637f238 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -78,6 +78,11 @@ checkbootparam(){
   esac
 }
 
+# Check if currently using a framebuffer
+hasfb() {
+    [ -e /dev/fb0 ] && return 0 || return 1
+}
+
 # Check wheter a configuration variable (like $CONFIG_TOHD) is
 # enabled or not
 checkvalue(){
@@ -214,7 +219,7 @@ config_language(){
 
  # set default to 'en' in live-cd mode if $LANGUAGE is not yet set:
  if [ -z "$INSTALLED" ] ; then
-    [ -n "$LANGUAGE" ] || LANGUAGE='us'
+    [ -n "$LANGUAGE" ] || LANGUAGE='en'
  fi
 
  # if bootoption lang is used update /etc/default/locale, otherwise *not*!
@@ -236,6 +241,9 @@ config_language(){
        else
           ewarn "/usr/share/consolefonts/Uni3-Terminus16.psf.gz not available. Please upgrade package console-terminus." ; eend 1
        fi
+       if ! hasfb ; then
+          CONSOLEFONT='Lat15-Terminus16'
+       fi
     fi
  fi
 
@@ -1989,7 +1997,9 @@ else
         fi
       fi
       DCSDEVICE=$(blkid -t LABEL=GRMLCFG | head -1 | awk -F: '{print $1}')
-      DCSMP="/mnt/grmlcfg"
+      if [ -n "$DCSDEVICE" ]; then
+        DCSMP="/mnt/grmlcfg"
+      fi
       eoutdent
     fi