7e3be77ef8
- Update to 0.8.6.1: + Fix systemd path file generation - Changes from 0.8.6: + fix flush_area fast-path + seed random number generator by default for script plugins + allow plymouth to be built without gtk dependency + cope with lack of /etc/os-release better + pull in systemd unit files (bnc#770890) + add support for new "updates" mode for doing package updates (only available for some plugins at the moment) - Add plymouth-restore-suspend.patch: revert commit removing suspend/resume support, needed for suspend package. - Add plymouth-systemd-target.patch: add missing symlinks to start plymouth on shutdown / reboot / kexec (bnc#770764). - Add plymouth-udevadm-path.patch: adapt to udevadm path on openSUSE. - Ensure systemctl daemon-reload is called in post / postun - Add systemd-no-warning.patch: remove Documentation tag not handled by systemd v44. - Update stop-graphical.patch to correct prevent plymouth.quit to start under runlevel 5 (handled by xdm initscript directly). OBS-URL: https://build.opensuse.org/request/show/128720 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=68
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 152304f3fd2ebd04ca6d49c62dce4ddd2269326a Mon Sep 17 00:00:00 2001
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Fri, 20 Jul 2012 11:07:29 +0200
|
|
Subject: [PATCH] Revert "libply: remove the unused SPLASH_MODE_SUSPEND and
|
|
SPLASH_MODE_RESUME"
|
|
|
|
This reverts commit 02c596757753589f7e49d26eab2759d552f24671.
|
|
|
|
Conflicts:
|
|
src/libply-splash-core/ply-boot-splash-plugin.h
|
|
src/plugins/splash/script/script-lib-plymouth.c
|
|
---
|
|
src/libply-splash-core/ply-boot-splash-plugin.h | 2 ++
|
|
src/plugins/splash/script/script-lib-plymouth.c | 6 ++++++
|
|
2 files changed, 8 insertions(+)
|
|
|
|
diff --git a/src/libply-splash-core/ply-boot-splash-plugin.h b/src/libply-splash-core/ply-boot-splash-plugin.h
|
|
index 2d73d66..1a67526 100644
|
|
--- a/src/libply-splash-core/ply-boot-splash-plugin.h
|
|
+++ b/src/libply-splash-core/ply-boot-splash-plugin.h
|
|
@@ -38,6 +38,8 @@ typedef enum
|
|
{
|
|
PLY_BOOT_SPLASH_MODE_BOOT_UP,
|
|
PLY_BOOT_SPLASH_MODE_SHUTDOWN,
|
|
+ PLY_BOOT_SPLASH_MODE_SUSPEND,
|
|
+ PLY_BOOT_SPLASH_MODE_RESUME,
|
|
PLY_BOOT_SPLASH_MODE_UPDATES,
|
|
PLY_BOOT_SPLASH_MODE_INVALID
|
|
} ply_boot_splash_mode_t;
|
|
diff --git a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c
|
|
index 5c648a6..eb7791e 100644
|
|
--- a/src/plugins/splash/script/script-lib-plymouth.c
|
|
+++ b/src/plugins/splash/script/script-lib-plymouth.c
|
|
@@ -61,6 +61,12 @@ static script_return_t plymouth_get_mode (script_state_t *state,
|
|
case PLY_BOOT_SPLASH_MODE_SHUTDOWN:
|
|
obj = script_obj_new_string ("shutdown");
|
|
break;
|
|
+ case PLY_BOOT_SPLASH_MODE_SUSPEND:
|
|
+ obj = script_obj_new_string ("suspend");
|
|
+ break;
|
|
+ case PLY_BOOT_SPLASH_MODE_RESUME:
|
|
+ obj = script_obj_new_string ("resume");
|
|
+ break;
|
|
case PLY_BOOT_SPLASH_MODE_UPDATES:
|
|
obj = script_obj_new_string ("updates");
|
|
break;
|
|
--
|
|
1.7.10.4
|
|
|