fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 11:58:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

two-step: Only create background_bgrt_fallback_image if use_firmware_background is set

Browse source 
We should not create (and try to use) the background_bgrt_fallback_image
when the config file has not requested use of the firmware-background.

Otherwise we will end up using bgrt-fallback.png if present even when the
config file has not requested usage of the firmware-background.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2021-03-05 12:02:21 +01:00
parent 9cb47b71cb
commit c5db6cf2d1
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/plugins/splash/two-step/plugin.c
View file

@ -1076,10 +1076,6 @@ create_plugin (ply_key_file_t *key_file)
plugin->background_tile_image = ply_image_new (image_path);
free (image_path);
asprintf (&image_path, "%s/bgrt-fallback.png", image_dir);
plugin->background_bgrt_fallback_image = ply_image_new (image_path);
free (image_path);
asprintf (&image_path, "%s/watermark.png", image_dir);
plugin->watermark_image = ply_image_new (image_path);
free (image_path);
@ -1182,9 +1178,14 @@ create_plugin (ply_key_file_t *key_file)
load_mode_settings (plugin, key_file, "system-upgrade", PLY_BOOT_SPLASH_MODE_SYSTEM_UPGRADE);
load_mode_settings (plugin, key_file, "firmware-upgrade", PLY_BOOT_SPLASH_MODE_FIRMWARE_UPGRADE);
if (plugin->use_firmware_background)
if (plugin->use_firmware_background) {
plugin->background_bgrt_image = ply_image_new ("/sys/firmware/acpi/bgrt/image");
asprintf (&image_path, "%s/bgrt-fallback.png", image_dir);
plugin->background_bgrt_fallback_image = ply_image_new (image_path);
free (image_path);
}
plugin->dialog_clears_firmware_background =
ply_key_file_get_bool (key_file, "two-step", "DialogClearsFirmwareBackground");