fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2025-12-20 08:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

main.c: Deprecate gdm transition signal

Browse source 
plymouth used to create a file in /var to tell gdm to start in active vt,
but gdm don't use this file now. and create file in filesystem too early
will cause race problem when /var is a seperate partition or it's on an
lvm volume.
This commit is contained in:
ZhaoQiang 2019-05-23 19:24:55 +00:00 • committed by Ray Strode
parent b9f2aac567
commit 0410212568
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -112,10 +112,6 @@ fi
AC_ARG_ENABLE(gdm-transition, AS_HELP_STRING([--enable-gdm-transition],[enable smooth transition to gdm]),enable_gdm_transition=$enableval,enable_gdm_transition=no) AC_ARG_ENABLE(gdm-transition, AS_HELP_STRING([--enable-gdm-transition],[enable smooth transition to gdm]),enable_gdm_transition=$enableval,enable_gdm_transition=no)
if test x$enable_gdm_transition = xyes; then
AC_DEFINE(PLY_ENABLE_DEPRECATED_GDM_TRANSITION, 1, [Enable deprecated smooth transition to GDM])
fi
AC_ARG_ENABLE(upstart-monitoring, AS_HELP_STRING([--enable-upstart-monitoring],[listen for messages on the Upstart D-Bus interface]),enable_upstart_monitoring=$enableval,enable_upstart_monitoring=no) AC_ARG_ENABLE(upstart-monitoring, AS_HELP_STRING([--enable-upstart-monitoring],[listen for messages on the Upstart D-Bus interface]),enable_upstart_monitoring=$enableval,enable_upstart_monitoring=no)
if test x$enable_upstart_monitoring = xyes; then if test x$enable_upstart_monitoring = xyes; then
PKG_CHECK_MODULES(DBUS, [dbus-1]) PKG_CHECK_MODULES(DBUS, [dbus-1])

18
src/main.c
View file

@ -1166,17 +1166,6 @@ on_hide_splash (state_t *state)
dump_details_and_quit_splash (state); dump_details_and_quit_splash (state);
} }
#ifdef PLY_ENABLE_DEPRECATED_GDM_TRANSITION
static void
tell_gdm_to_transition (void)
{
int fd;
fd = creat ("/var/spool/gdm/force-display-on-active-vt", 0644);
close (fd);
}
#endif
static void static void
quit_program (state_t *state) quit_program (state_t *state)
{ {
@ -1192,13 +1181,6 @@ quit_program (state_t *state)
pid_file = NULL; pid_file = NULL;
} }
#ifdef PLY_ENABLE_DEPRECATED_GDM_TRANSITION
if (state->should_retain_splash &&
state->mode == PLY_BOOT_SPLASH_MODE_BOOT_UP)
tell_gdm_to_transition ();
#endif
if (state->deactivate_trigger != NULL) { if (state->deactivate_trigger != NULL) {
ply_trigger_pull (state->deactivate_trigger, NULL); ply_trigger_pull (state->deactivate_trigger, NULL);
state->deactivate_trigger = NULL; state->deactivate_trigger = NULL;