webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-19 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change default font to that what we use in IPFire 3

Browse Source
This commit is contained in:
Michael Tremer
2014-12-26 18:00:51 +01:00
parent 0d87efae29
commit 66c684fa60
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/common/kbd
View File

@@ -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

12
lfs/kbd
View File

@@ -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

2
src/initscripts/init.d/console
View File

@@ -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"

2
src/installer/dracut-module/run-installer.sh
View File

@@ -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"