From: Canek Peláez Valdés <caneko@gmail.com>
Date: Mon, 15 Oct 2012 00:51:54 +0000 (-0500)
Subject: Don't install FONT if it's the same as DEFAULT_FONT.
X-Git-Tag: 024~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5c9bc1198ce01c8e80822f83b4162a1fd1465ab;p=thirdparty%2Fdracut.git

Don't install FONT if it's the same as DEFAULT_FONT.

If the user defines FONT in /etc/vconsole.conf as the same font
defined in DEFAULT_FONT, when creating her initd she will get a
message similar to this one:

gzip: /var/tmp/initramfs.wzl9Qt/usr/share/consolefonts/LatArCyrHeb-16.psfu
already exists; do you wish to overwrite (y or n)?

Signed-off-by: Canek Peláez <canek@ciencias.unam.mx>
---

diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index df6e5b193..1ed1db68d 100755
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -173,7 +173,7 @@ install() {
 
         inst_opt_decompress ${kbddir}/consolefonts/${DEFAULT_FONT}.*
 
-        if [[ ${FONT} ]]
+        if [[ ${FONT} ]] && [[ ${FONT} != ${DEFAULT_FONT} ]]
         then
             FONT=${FONT%.psf*}
             inst_opt_decompress ${kbddir}/consolefonts/${FONT}.*