projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use lang=en as default (instead of lang=us).
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
5519f28
..
637f238
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-78,6
+78,11
@@
checkbootparam(){
esac
}
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(){
# 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
# 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*!
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
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
fi
fi