Change default font to that what we use in IPFire 3

diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd
index 7b6ccc358c18597fe5625ca054e0f5802e264ade..5f694ff0c900070fcb661fa8baf9e1e9402704ec 100644 (file)
--- a/config/rootfiles/common/kbd
+++ b/config/rootfiles/common/kbd
@@ -137,6 +137,7 @@ lib/kbd/consolefonts/iso07u-16.psfu.gz
 #lib/kbd/consolefonts/lat0-12.psfu.gz
 #lib/kbd/consolefonts/lat0-14.psfu.gz
 lib/kbd/consolefonts/lat0-16.psfu.gz
+lib/kbd/consolefonts/lat0-sun16.psfu.gz
 #lib/kbd/consolefonts/lat1-08.psfu.gz
 #lib/kbd/consolefonts/lat1-10.psfu.gz
 #lib/kbd/consolefonts/lat1-12.psfu.gz
@@ -147,6 +148,7 @@ lib/kbd/consolefonts/lat1-16.psfu.gz
 #lib/kbd/consolefonts/lat2-12.psfu.gz
 #lib/kbd/consolefonts/lat2-14.psfu.gz
 lib/kbd/consolefonts/lat2-16.psfu.gz
+lib/kbd/consolefonts/lat2-sun16.psfu.gz
 #lib/kbd/consolefonts/lat2a-16.psfu.gz
 #lib/kbd/consolefonts/lat4-08.psfu.gz
 #lib/kbd/consolefonts/lat4-10.psfu.gz
@@ -188,6 +190,7 @@ lib/kbd/consolefonts/lat5-16.psfu.gz
 #lib/kbd/consolefonts/lat9w-12.psfu.gz
 #lib/kbd/consolefonts/lat9w-14.psfu.gz
 #lib/kbd/consolefonts/lat9w-16.psfu.gz
+lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz
 #lib/kbd/consolefonts/partialfonts
 #lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.08.gz
 #lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.14.gz

diff --git a/lfs/kbd b/lfs/kbd
index 1c9924279826e38c26702ad116da225d09b8c34c..bb9d261a7d5cbbcf16051107a7e8bfb71adb5885 100644 (file)
--- a/lfs/kbd
+++ b/lfs/kbd
@@ -35,13 +35,18 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch
+objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch \
+       kbd-latarcyrheb-16-fixed.tar.bz2 kbd-latsun-fonts.tar.bz2
 
 $(DL_FILE)                            = $(DL_FROM)/$(DL_FILE)
 $(THISAPP)-more-programs-1.patch      = $(DL_FROM)/kbd-$(VER)-more-programs-1.patch
+kbd-latarcyrheb-16-fixed.tar.bz2      = $(DL_FROM)/kbd-latarcyrheb-16-fixed.tar.bz2
+kbd-latsun-fonts.tar.bz2              = $(DL_FROM)/kbd-latsun-fonts.tar.bz2
 
 $(DL_FILE)_MD5                        = 069d1175b4891343b107a8ac2b4a39f6
 $(THISAPP)-more-programs-1.patch_MD5  = dc70180a6bc0afa2b741cd38e3cc2e18
+kbd-latarcyrheb-16-fixed.tar.bz2_MD5  = 884fdbb0b952b2e3e8389a0c40a3e301
+kbd-latsun-fonts.tar.bz2_MD5          = e22ee88353968df8d4a4b1bf1fa8fc31
 
 install : $(TARGET)
 
@@ -74,6 +79,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-more-programs-1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-backspace-1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-1.patch
+
+       # Extract our own fonts
+       cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latarcyrheb-16-fixed.tar.bz2
+       cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latsun-fonts.tar.bz2
+
        cd $(DIR_APP) && ./configure --datadir=/lib/kbd --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/src/initscripts/init.d/console b/src/initscripts/init.d/console
index 7381a69b3cccc3a4d058f72b9d3057d51de83484..8757b4d26af1a74c293f1abb7cddac4f5a4f0cb8 100644 (file)
--- a/src/initscripts/init.d/console
+++ b/src/initscripts/init.d/console
@@ -17,7 +17,7 @@
 . ${rc_functions}
 eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
 
-FONT="LatArCyrHeb-16"
+FONT="latarcyrheb-sun16"
 KEYMAP_CORRECTIONS="euro2"
 UNICODE="1"
 BROKEN_COMPOSE="0"

diff --git a/src/installer/dracut-module/run-installer.sh b/src/installer/dracut-module/run-installer.sh
index ea9669a86cfc40084426f5f9be552bcc86c4e37a..33c8c4b10b7fe54a5e9d7cc5532ad662cf72dbe2 100644 (file)
--- a/src/installer/dracut-module/run-installer.sh
+++ b/src/installer/dracut-module/run-installer.sh
@@ -12,7 +12,7 @@ fi
 echo -en '\033%G' && kbd_mode -u
 
 # Load default console font
-setfont LatArCyrHeb-16
+setfont latarcyrheb-sun16
 
 # Silence the kernel
 echo >/proc/sys/kernel/printk "1 4 1 7"