Send plymouth mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.freedesktop.org/mailman/listinfo/plymouth
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of plymouth digest..."
Today's Topics:
1. [PATCH 1/2] add ply_trace() to throbgress functions (Will Woods)
2. these two patches are unrelated (Will Woods)
3. [PATCH 2/2] If PLYMOUTH_THEME_NAME is set, write it into
plymouthd.conf (Will Woods)
----------------------------------------------------------------------
Message: 1
Date: Thu, 29 Nov 2012 10:25:02 -0500
From: Will Woods <[email protected]>
To: [email protected]
Subject: [PATCH 1/2] add ply_trace() to throbgress functions
Message-ID: <[email protected]>
These were melded into place from two-step/plugin.c.
---
src/plugins/splash/throbgress/plugin.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/src/plugins/splash/throbgress/plugin.c
b/src/plugins/splash/throbgress/plugin.c
index 5ed6c06..fba809b 100644
--- a/src/plugins/splash/throbgress/plugin.c
+++ b/src/plugins/splash/throbgress/plugin.c
@@ -247,6 +247,8 @@ pause_views (ply_boot_splash_plugin_t *plugin)
{
ply_list_node_t *node;
+ ply_trace ("pausing views");
+
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -267,6 +269,8 @@ unpause_views (ply_boot_splash_plugin_t *plugin)
{
ply_list_node_t *node;
+ ply_trace ("unpausing views");
+
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -431,6 +435,8 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
if (plugin == NULL)
return;
+ ply_trace ("destroying plugin");
+
if (plugin->loop != NULL)
{
ply_event_loop_stop_watching_for_exit (plugin->loop,
(ply_event_loop_exit_handler_t)
@@ -510,6 +516,8 @@ start_animation (ply_boot_splash_plugin_t *plugin)
if (plugin->is_animating)
return;
+ ply_trace ("starting animation");
+
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -542,6 +550,9 @@ stop_animation (ply_boot_splash_plugin_t *plugin,
if (!plugin->is_animating)
return;
+ ply_trace ("stopping animation%s",
+ trigger != NULL? " with trigger" : "");
+
plugin->is_animating = false;
node = ply_list_get_first_node (plugin->views);
@@ -619,6 +630,7 @@ add_pixel_display (ply_boot_splash_plugin_t *plugin,
{
view_t *view;
+ ply_trace ("adding pixel display to plugin");
view = view_new (plugin, display);
ply_pixel_display_set_draw_handler (view->display,
@@ -634,6 +646,7 @@ remove_pixel_display (ply_boot_splash_plugin_t *plugin,
{
ply_list_node_t *node;
+ ply_trace ("removing pixel display from plugin");
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -745,6 +758,7 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
{
assert (plugin != NULL);
+ ply_trace ("hiding splash");
if (plugin->loop != NULL)
{
stop_animation (plugin, NULL);
@@ -765,6 +779,7 @@ show_password_prompt (ply_boot_splash_plugin_t *plugin,
{
ply_list_node_t *node;
+ ply_trace ("showing password prompt");
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -788,6 +803,7 @@ show_prompt (ply_boot_splash_plugin_t *plugin,
{
ply_list_node_t *node;
+ ply_trace ("showing prompt");
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -807,6 +823,7 @@ show_prompt (ply_boot_splash_plugin_t *plugin,
static void
on_root_mounted (ply_boot_splash_plugin_t *plugin)
{
+ ply_trace ("root filesystem mounted");
plugin->root_is_mounted = true;
}
@@ -814,8 +831,10 @@ static void
become_idle (ply_boot_splash_plugin_t *plugin,
ply_trigger_t *idle_trigger)
{
+ ply_trace ("deactivation requested");
if (plugin->is_idle)
{
+ ply_trace ("plugin is already idle");
ply_trigger_pull (idle_trigger, NULL);
return;
}
@@ -829,6 +848,7 @@ hide_prompt (ply_boot_splash_plugin_t *plugin)
{
ply_list_node_t *node;
+ ply_trace ("hiding prompt");
node = ply_list_get_first_node (plugin->views);
while (node != NULL)
{
@@ -844,6 +864,7 @@ hide_prompt (ply_boot_splash_plugin_t *plugin)
}
}
+
static void
show_message (ply_boot_splash_plugin_t *plugin,
const char *message)
--
1.8.0
------------------------------
Message: 2
Date: Thu, 29 Nov 2012 10:37:22 -0500
From: Will Woods <[email protected]>
To: [email protected]
Subject: these two patches are unrelated
Message-ID: <[email protected]>
Content-Type: text/plain; charset="UTF-8"
Please ignore the "1/2" and "2/2" in the subjects.
(Tip: "git send-email --no-thread" doesn't imply "--no-numbered". D'oh.)
Sorry for any confusion!
-w
------------------------------
Message: 3
Date: Thu, 29 Nov 2012 10:25:03 -0500
From: Will Woods <[email protected]>
To: [email protected]
Subject: [PATCH 2/2] If PLYMOUTH_THEME_NAME is set, write it into
plymouthd.conf
Message-ID: <[email protected]>
You can set PLYMOUTH_THEME_NAME when building initramfs to get a
different theme into initramfs, but this doesn't change the default
theme, so the resulting initramfs won't actually use the theme we
installed.
This patch makes plymouth-populate-initrd rewrite the 'Theme=XXX' line
in plymouthd.conf, so plymouth will use the theme we install.
---
scripts/plymouth-populate-initrd.in | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/plymouth-populate-initrd.in
b/scripts/plymouth-populate-initrd.in
index 8d1eec0..d901a9b 100755
--- a/scripts/plymouth-populate-initrd.in
+++ b/scripts/plymouth-populate-initrd.in
@@ -8,6 +8,7 @@
[ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="@PLYMOUTH_DATADIR@"
[ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth
--get-splash-plugin-path)"
[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@PLYMOUTH_LOGO_FILE@"
+[ -n "$PLYMOUTH_THEME_NAME" ] && THEME_OVERRIDE=1
[ -z "$PLYMOUTH_THEME_NAME" ] &&
PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
[ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@"
[ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@"
@@ -388,6 +389,12 @@ if [ -z "$PLYMOUTH_THEME_NAME" ]; then
exit 1
fi
+if [ $THEME_OVERRIDE ]; then
+ conf=$INITRDDIR/${PLYMOUTH_CONFDIR}/plymouthd.conf
+ echo "modifying plymouthd.conf: Theme=$PLYMOUTH_THEME_NAME" > /dev/stderr
+ sed -i "s/^ *Theme *=.*/# theme modified by
plymouth-populate-initrd\nTheme=$PLYMOUTH_THEME_NAME/" $conf
+fi
+
PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *"
${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth
| sed 's/ModuleName *= *//')
if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
--
1.8.0
------------------------------
_______________________________________________
plymouth mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/plymouth
End of plymouth Digest, Vol 45, Issue 5
***************************************
