Attachment 45421 Details for Bug 36052 – Allow skipping font setting

[patch] Allow skipping font setting

0001-Allow-skipping-font-setting.patch (text/plain), 1.20 KB, created by Marc-Antoine Perennou on 2011-04-08 07:05:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc-Antoine Perennou

Created: 2011-04-08 07:05:03 UTC

Size: 1.20 KB

patch

obsolete

>From 01d99d39887a7ba69bc72c6acd0fc280fbb3df63 Mon Sep 17 00:00:00 2001
>From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
>Date: Thu, 7 Apr 2011 15:31:22 +0200
>Subject: [PATCH] Allow skipping font setting
>
>In some cases, we may want to keep the font which is built in the kernel
>instead of setting a new one.
>Allow user to disable setting a new one by setting the consolefont to "none".
>
>Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
>---
> src/vconsole-setup.c |    5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
>index 67fb7b6..f77ad61 100644
>--- a/src/vconsole-setup.c
>+++ b/src/vconsole-setup.c
>@@ -424,8 +424,9 @@ int main(int argc, char **argv) {
>                 disable_utf8(fd);
> 
>         if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
>-            load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
>-                r = EXIT_SUCCESS;
>+            (strcmp(vc_font, "none") == 0 ||
>+                load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0))
>+                    r = EXIT_SUCCESS;
> 
> finish:
>         if (keymap_pid > 0)
>-- 
>1.7.5.rc0.116.g44bc5.dirty
>

Actions: View | Splinter Review

Attachments on bug 36052: 45371 | 45372 | 45414 | 45420 | 45421 | 45428 | 45440

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.