Attachment 125965 Details for Bug 97424 – main, libply: Support plymouth.force-scale on the kernel command line

[patch] main, libply: Support plymouth.force-scale on the kernel command line

0003-main-libply-Support-plymouth.force-scale-on-the-kern.patch (text/plain), 1.76 KB, created by Michael Kuhn on 2016-08-22 20:47:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Kuhn

Created: 2016-08-22 20:47:31 UTC

Size: 1.76 KB

patch

obsolete

>From 71d58d2162d24eaf70c414da919a2d016151aedc Mon Sep 17 00:00:00 2001
>From: Michael Kuhn <suraia@ikkoku.de>
>Date: Mon, 22 Aug 2016 18:39:35 +0200
>Subject: [PATCH 3/3] main, libply: Support plymouth.force-scale on the kernel
> command line
>
>This can be used to override the DeviceScale setting and removes support
>for the PLYMOUTH_FORCE_SCALE environment variable.
>---
> src/libply/ply-utils.c |  3 ---
> src/main.c             | 13 +++++++++++++
> 2 files changed, 13 insertions(+), 3 deletions(-)
>
>diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c
>index 7ce4f5b..117ba6e 100644
>--- a/src/libply/ply-utils.c
>+++ b/src/libply/ply-utils.c
>@@ -985,9 +985,6 @@ ply_get_device_scale (uint32_t width,
> 
>         device_scale = 1;
> 
>-        if ((force_device_scale = getenv ("PLYMOUTH_FORCE_SCALE")))
>-                return strtoul (force_device_scale, NULL, 0);
>-
>         if (device_scale_setting != 0)
>                 return device_scale_setting;
> 
>diff --git a/src/main.c b/src/main.c
>index 3b7b179..0864e5e 100644
>--- a/src/main.c
>+++ b/src/main.c
>@@ -441,6 +441,17 @@ find_override_splash (state_t *state)
> }
> 
> static void
>+find_force_scale (state_t *state)
>+{
>+        const char *scale_string;
>+
>+        scale_string = command_line_get_string_after_prefix (state->kernel_command_line, "plymouth.force-scale=");
>+
>+        if (scale_string != NULL)
>+                ply_set_device_scale (strtoul (scale_string, NULL, 0));
>+}
>+
>+static void
> find_system_default_splash (state_t *state)
> {
>         if (state->system_default_splash_path != NULL)
>@@ -2333,6 +2344,8 @@ main (int    argc,
>                 state.splash_delay = NAN;
>         }
> 
>+        find_force_scale (&state);
>+
>         load_devices (&state, device_manager_flags);
> 
>         ply_trace ("entering event loop");
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 97424: 125933 | 125934 | 125948 | 125949 | 125950 | 125963 | 125964 | 125965

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.