summary refs log tree commit diff
diff options
context:
space:
mode:
authorJuan RP <xtraeme@gmail.com>2014-04-26 23:52:31 +0200
committerJuan RP <xtraeme@gmail.com>2014-04-26 23:52:31 +0200
commit2b8df504105c12f753d8f807524db937466e8369 (patch)
tree922a7b3793767ecc4e2adc2a15495bfe4fd3174e
parent5c6c44f1852c079f299ab2de985ea093162018a3 (diff)
downloadrunit-void-2b8df504105c12f753d8f807524db937466e8369.tar.gz
runit-void-2b8df504105c12f753d8f807524db937466e8369.tar.xz
runit-void-2b8df504105c12f753d8f807524db937466e8369.zip
Rename font vars to make them compatible with dracut naming.
-rwxr-xr-x16
-rw-r--r--rc.conf6
2 files changed, 6 insertions, 6 deletions
diff --git a/1 b/1
index e8f7b79..45405ee 100755
--- a/1
+++ b/1
@@ -49,10 +49,10 @@ msg "Setting up ttys to unicode mode...\n"
 for i in /dev/tty[0-6]; do
     unicode_start < $i
 done
-if [ -n "$CONSOLEFONT" ]; then
-    msg "Setting up ttys font to '${CONSOLEFONT}'...\n"
+if [ -n "$FONT" ]; then
+    msg "Setting up ttys font to '${FONT}'...\n"
     for i in /dev/tty[0-6]; do
-        setfont ${CONSOLEMAP:+-m $CONSOLEMAP} $CONSOLEFONT -C $i
+        setfont ${FONT_MAP:+-m $FONT_MAP} ${FONT_UNIMAP:+-u $FONT_UNIMAP} $FONT -C $i
     done
 fi
 
diff --git a/rc.conf b/rc.conf
index ac58608..6ce241f 100644
--- a/rc.conf
+++ b/rc.conf
@@ -10,13 +10,13 @@ TIMEZONE="Europe/Madrid"
 KEYMAP="es"
 
 # Console font to load, see setfont(8).
-CONSOLEFONT="lat9w-16"
+FONT="lat9w-16"
 
 # Console map to load, see setfont(8).
-#CONSOLEMAP=
+#FONT_MAP=
 
 # Font unimap to load, see setfont(8).
-#UNIMAP=
+#FONT_UNIMAP=
 
 # Kernel modules to load, delimited by blanks.
 #MODULES=""