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

Revert "systemd: create flag file to notify systemd that plymouth is around"

Browse source 
This reverts commit 8c267e9a3b.

I think this patch was accidentally pushed, since the commit date is
years older than the push date, and it seems to overlap in already
existing pid-file functionality.

If we actually do need this commit we can always add it back of course.
This commit is contained in:
Ray Strode 2014-03-27 16:11:50 -04:00
parent 8c267e9a3b
commit dec733032b
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main.c
View file

@ -69,13 +69,13 @@ typedef enum {
PLY_MODE_UPDATES
} ply_mode_t;
typedef struct
typedef struct
{
const char *keys;
ply_trigger_t *trigger;
} ply_keystroke_watch_t;
typedef struct
typedef struct
{
enum {PLY_ENTRY_TRIGGER_TYPE_PASSWORD,
PLY_ENTRY_TRIGGER_TYPE_QUESTION}
@ -578,9 +578,9 @@ on_hide_message (state_t *state,
const char *message)
{
ply_list_node_t *node;
ply_trace ("hiding message %s", message);
node = ply_list_get_first_node (state->messages);
while (node != NULL)
{
@ -1310,9 +1310,6 @@ on_quit (state_t *state,
return;
}
/* Tell everybody (i.e. systemd) that Plymouth is gone home */
unlink ("/run/initramfs/plymouth");
if (state->system_initialized)
{
ply_trace ("system initialized so saving boot-duration file");
@ -1410,7 +1407,7 @@ static void
update_display (state_t *state)
{
if (!state->boot_splash) return;
ply_list_node_t *node;
node = ply_list_get_first_node (state->entry_triggers);
if (node)
@ -1421,7 +1418,7 @@ update_display (state_t *state)
int bullets = ply_utf8_string_get_length (ply_buffer_get_bytes (state->entry_buffer),
ply_buffer_get_size (state->entry_buffer));
bullets = MAX(0, bullets);
ply_boot_splash_display_password (state->boot_splash,
ply_boot_splash_display_password (state->boot_splash,
entry_trigger->prompt,
bullets);
}
@ -2261,14 +2258,6 @@ main (int argc,
{
if (errno == 0)
{
int fd;
/* Tell everybody (i.e. systemd) that Plymouth is in town */
mkdir("/run/initramfs", 0755);
fd = open ("/run/initramfs/plymouth", O_WRONLY|O_CREAT|O_CLOEXEC, 0644);
if (fd >= 0)
close(fd);
if (daemon_handle != NULL)
ply_detach_daemon (daemon_handle, 0);
return 0;
@ -2369,7 +2358,7 @@ main (int argc,
ply_progress_free (state.progress);
ply_trace ("exiting with code %d", exit_code);
if (debug_buffer != NULL)
{
dump_debug_buffer_to_file ();