|
|
@ -152,8 +152,7 @@ bool ply_start(int mode)
|
|
|
|
|
|
|
|
|
|
|
|
bool ply_update_status(int hook, const char* name)
|
|
|
|
bool ply_update_status(int hook, const char* name)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
//return (commandf("/bin/plymouth update --status=%d-%s", hook, name) == 0);
|
|
|
|
return (commandf("/bin/plymouth update --status=%d-%s", hook, name) == 0);
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool kernel_command_has_argument(const char *argument)
|
|
|
|
bool kernel_command_has_argument(const char *argument)
|
|
|
@ -243,9 +242,9 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
|
|
|
|
/* Start the Plymouth daemon and show splash when system is being shut
|
|
|
|
/* Start the Plymouth daemon and show splash when system is being shut
|
|
|
|
* down. */
|
|
|
|
* down. */
|
|
|
|
if(strcmp(name, RC_LEVEL_SHUTDOWN) == 0 &&
|
|
|
|
if(strcmp(name, RC_LEVEL_SHUTDOWN) == 0 &&
|
|
|
|
(kernel_command_has_argument("splash") ||
|
|
|
|
(kernel_command_has_argument("splash") ||
|
|
|
|
kernel_command_has_argument("splash=shutdown")))
|
|
|
|
kernel_command_has_argument("splash=shutdown")))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
DBG("ply_start(PLY_MODE_SHUTDOWN)");
|
|
|
|
DBG("ply_start(PLY_MODE_SHUTDOWN)");
|
|
|
|
if(!ply_start(PLY_MODE_SHUTDOWN)
|
|
|
|
if(!ply_start(PLY_MODE_SHUTDOWN)
|
|
|
|
|| !ply_update_rootfs_rw())
|
|
|
|
|| !ply_update_rootfs_rw())
|
|
|
@ -259,9 +258,9 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
|
|
|
|
* runlevel. Required /proc and /sys should already be mounted in
|
|
|
|
* runlevel. Required /proc and /sys should already be mounted in
|
|
|
|
* sysinit runlevel. */
|
|
|
|
* sysinit runlevel. */
|
|
|
|
if(strcmp(name, bootlevel) == 0 &&
|
|
|
|
if(strcmp(name, bootlevel) == 0 &&
|
|
|
|
(kernel_command_has_argument("splash") ||
|
|
|
|
(kernel_command_has_argument("splash") ||
|
|
|
|
kernel_command_has_argument("splash=silent")))
|
|
|
|
kernel_command_has_argument("splash=silent")))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
DBG("ply_start(PLY_MODE_BOOT)");
|
|
|
|
DBG("ply_start(PLY_MODE_BOOT)");
|
|
|
|
if(!ply_start(PLY_MODE_BOOT))
|
|
|
|
if(!ply_start(PLY_MODE_BOOT))
|
|
|
|
rv = 1;
|
|
|
|
rv = 1;
|
|
|
@ -307,7 +306,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
|
|
|
|
if(!ply_update_rootfs_rw())
|
|
|
|
if(!ply_update_rootfs_rw())
|
|
|
|
rv = 1;
|
|
|
|
rv = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|