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

Drop support for starting a session from within plymouth

Browse source 
We aren't going to be supporting the

       #!/bin/plymouth nash

form anymore, instead we're going to require

       #!/bin/nash
       plymouth --asdaemon
This commit is contained in:
Ray Strode 2008-06-03 21:15:01 -04:00
parent fcf61c56be
commit c085ef5eb6
1 changed files with 2 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main.c
View file

@ -69,19 +69,6 @@ typedef struct
static ply_boot_splash_t *start_boot_splash (state_t *state,
const char *module_path);
static void
on_session_start (state_t *state)
{
ply_trace ("changing to original root fs");
if (fchdir (state->original_root_dir_fd) < 0)
{
ply_trace ("Could not change to original root directory "
"to start session: %m");
return;
}
}
static void
on_session_output (state_t *state,
const char *output,
@ -265,8 +252,7 @@ start_boot_splash (state_t *state,
}
static ply_terminal_session_t *
spawn_session (state_t *state,
char **argv)
attach_to_running_session (state_t *state)
{
ply_terminal_session_t *session;
ply_terminal_session_flags_t flags;
@ -298,34 +284,6 @@ spawn_session (state_t *state,
return NULL;
}
}
else
{
flags |= PLY_TERMINAL_SESSION_FLAGS_RUN_IN_PARENT;
flags |= PLY_TERMINAL_SESSION_FLAGS_LOOK_IN_PATH;
flags |= PLY_TERMINAL_SESSION_FLAGS_CHANGE_ROOT_TO_CURRENT_DIRECTORY;
ply_trace ("opening terminal session for '%s'", argv[0]);
session = ply_terminal_session_new ((const char * const *) argv);
ply_trace ("attaching terminal session to event loop");
ply_terminal_session_attach_to_event_loop (session, state->loop);
ply_trace ("running '%s'", argv[0]);
if (!ply_terminal_session_run (session, flags,
(ply_terminal_session_begin_handler_t)
on_session_start,
(ply_terminal_session_output_handler_t)
on_session_output,
(ply_terminal_session_done_handler_t)
on_session_finished, state))
{
ply_save_errno ();
ply_terminal_session_free (session);
ply_buffer_free (state->boot_buffer);
state->boot_buffer = NULL;
ply_restore_errno ();
return NULL;
}
}
return session;
}
@ -655,7 +613,7 @@ main (int argc,
state.boot_buffer = ply_buffer_new ();
state.session = spawn_session (&state, argv + 1);
state.session = attach_to_running_session (&state);
if (state.session == NULL)
{