commit c93f3d5bd291ebe43b88afb384e2adb34264f91a
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Jun 9 19:23:36 2014 +0200
- rel 3; load font at initrd
geninitrd-git.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
geninitrd.spec | 4 ++--
2 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/geninitrd.spec b/geninitrd.spec
index 3241f57..6005d3d 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -7,7 +7,7 @@ Summary: Creates an initial ramdisk image for preloading
modules
Summary(pl.UTF-8): Narzędzie do tworzenia inicjalnego ramdysku używanego
przy starcie systemu
Name: geninitrd
Version: 12736
-Release: 2
+Release: 3
License: GPL
Group: Applications/System
Source0: %{name}-%{version}.tar.gz
@@ -17,7 +17,7 @@ URL:
http://git.pld-linux.org/?p=projects/geninitrd.git
BuildRequires: xmlto >= 0:0.0.18-1
Requires: /usr/bin/ldd
Requires: awk
-Requires: busybox-initrd >= 1.12.2-2
+Requires: busybox-initrd >= 1.22.1-2
Requires: coreutils
Requires: cpio
Requires: fileutils
diff --git a/geninitrd-git.patch b/geninitrd-git.patch
index 706c264..59fae92 100644
--- a/geninitrd-git.patch
+++ b/geninitrd-git.patch
@@ -17,3 +17,47 @@ index dbb7c53..6e3008d 100644
# initrd dedicated rules
inst_rules 01-ignore.rules 59-persistent-storage.rules
61-persistent-storage.rules 11-dm.rules
+commit ff9aded51db8fa19316dde7864ec193f5fdf22b6
+Author: Arkadiusz Miśkiewicz <[email protected]>
+Date: Mon Jun 9 11:19:10 2014 +0200
+
+ Load configured font and do it early.
+
+diff --git a/geninitrd b/geninitrd
+index 2478063..f31f00d 100755
+--- a/geninitrd
++++ b/geninitrd
+@@ -202,6 +202,25 @@ mount_dev() {
+ EOF
+ }
+
++# load font
++load_font() {
++ local font
++ [ ! -r /etc/sysconfig/console ] && return
++ . /etc/sysconfig/console
++ if [ -n "$CONSOLEFONT" ]; then
++ font=$(ls -1 /lib/kbd/consolefonts/${CONSOLEFONT}*.gz 2>
/dev/null)
++ if [ -n "$font" ]; then
++ verbose "Loading font $font"
++ busybox_applet loadfont
++ inst_d "/lib/kbd/consolefonts"
++ cp -a "$font" "$DESTDIR/lib/kbd/consolefonts/"
++ gunzip
${DESTDIR}/lib/kbd/consolefonts/${CONSOLEFONT}*.gz
++ font=${font%.gz}
++ echo "loadfont < $font" | add_linuxrc
++ fi
++ fi
++}
++
+ # generate code to mount /proc on initrd
+ # can be called multiple times
+ mount_proc() {
+@@ -1478,6 +1497,7 @@ add_linuxrc <<EOF
+ # on $(LC_ALL=C date)
+
+ EOF
++load_font
+ mount_proc
+
+ kmsg "geninitrd/$VERSION starting"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/geninitrd.git/commitdiff/c93f3d5bd291ebe43b88afb384e2adb34264f91a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
