On 02/12/2010 01:49 AM, Thomas Bächler wrote:
Am 11.02.2010 22:08, schrieb Ionut Biru:
Hi,
First the current implementation doesn't work since CONSOLEFONT is
always zero. Second i don't know anything about fonts and why does the
first commiter only enabled pfsu.gz fonts but i tested with a psf.gz
font and is working fine and i decided to add any *.gz font.
Comments?
If you had posted your patch inline (as git intended it) I could comment
on it directly, but now thunderbird won't quote it.
First, you introduced a broken if [ ... ] statement in the first hunk
that will cause an error (missing space).
Second, the original commiter intended the console font to be set in
mkinitcpio.conf, so he can remove the consolefont setting in rc.conf.
Apparently his system boots faster this way.
Third, using a * in finding the file may return several files.
Furthermore, the * won't be expanded because it is quoted.
Did you test this patch at all?
i did test it but i misspelled when doing the patch. Here is another
patch that only fixes detecting the font in rc.conf since i don't see
any point of loading from mkinitcpio.conf. I removed psf.gz since i
didn't find what's the difference between psfu.gz and psf.gz and maybe
it supposed to be handled in other way.
I hope that now is inline. Thunderbird 3 is sending as "real
attachments" now.
--
Ionut
>From e04f1f985fdc3a06a3b2a6c162718116fbd4a785 Mon Sep 17 00:00:00 2001
From: Ionut Biru <[email protected]>
Date: Fri, 12 Feb 2010 20:42:34 +0200
Subject: [PATCH] fix detection of CONSOLEFONT from rc.conf
Signed-off-by: Ionut Biru <[email protected]>
---
install/consolefont | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/install/consolefont b/install/consolefont
index 67777b8..789a661 100644
--- a/install/consolefont
+++ b/install/consolefont
@@ -6,6 +6,7 @@ install ()
BINARIES=""
FILES=""
SCRIPT="consolefont"
+ eval "$(grep -e "^CONSOLEFONT=" /etc/rc.conf)"
if [ -n "$CONSOLEFONT" ]; then
CONSOLEFONT_FILE_GZ="/usr/share/kbd/consolefonts/$CONSOLEFONT.psfu.gz"
if [ -e ${CONSOLEFONT_FILE_GZ} ]; then
@@ -22,10 +23,6 @@ install ()
help ()
{
cat<<HELPEOF
- This hook loads consolefont specified in mkinitcpio.conf
- during early userspace.
- You should add CONSOLEFONT="font" (same syntax as in rc.conf) to your
- mkinitcpio.conf. You may also remove the CONSOLEFONT from rc.conf
- to prevent the font from being set twice and speed up your boot proccess.
+ This hook loads consolefont specified in rc.conf during early userspace.
HELPEOF
}
--
1.6.6.1
