summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-12-02 05:28:59 +0100
committerDave Reisner <dreisner@archlinux.org>2012-12-02 18:28:58 +0100
commit6be469d5f21309fe80d927d277d37a99db22b511 (patch)
tree77a4077a3d5cfbfbfb36d5ff3d041acb57f96413
parente46f4c5723083f952b3e74d118252b4bf4e0b1ef (diff)
downloadmkinitcpio-6be469d5f21309fe80d927d277d37a99db22b511.tar.gz
mkinitcpio-6be469d5f21309fe80d927d277d37a99db22b511.tar.xz
consolefont: fix reference to consolefont variable
Broken by ac8499c08279b05d. FS#32935. https://bbs.archlinux.org/viewtopic.php?id=153982 Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rw-r--r--install/consolefont8
1 files changed, 4 insertions, 4 deletions
diff --git a/install/consolefont b/install/consolefont
index bbcd7ec..c10b65d 100644
--- a/install/consolefont
+++ b/install/consolefont
@@ -5,8 +5,8 @@ build() {
(
[[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf
- if [[ $CONSOLEFONT ]]; then
- for file in "/usr/share/kbd/consolefonts/$CONSOLEFONT".@(fnt|psf?(u))?(.gz); do
+ if [[ $FONT ]]; then
+ for file in "/usr/share/kbd/consolefonts/$FONT".@(fnt|psf?(u))?(.gz); do
if [[ -e $file ]]; then
[[ $file =~ (\.(fnt|psfu?))(\.gz)?$ ]] && ext=${BASH_REMATCH[2]}
if [[ $file = *.gz ]]; then
@@ -17,7 +17,7 @@ build() {
exit 0
fi
done
- error "consolefont: requested font not found: \`%s'" "$CONSOLEFONT"
+ error "consolefont: requested font not found: \`%s'" "$FONT"
exit 1
else
warning "consolefont: no font found in configuration"
@@ -28,7 +28,7 @@ build() {
help() {
cat <<HELPEOF
-This hook loads consolefont specified in locale.conf during early userspace.
+This hook loads consolefont specified in vconsole.conf during early userspace.
HELPEOF
}