From 0410212568ae3abe1606d980728a9ca26c04c034 Mon Sep 17 00:00:00 2001 From: ZhaoQiang Date: Thu, 23 May 2019 19:24:55 +0000 Subject: [PATCH] main.c: Deprecate gdm transition signal 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. --- configure.ac | 4 ---- src/main.c | 18 ------------------ 2 files changed, 22 deletions(-) diff --git a/configure.ac b/configure.ac index 97710274..a2362fa6 100644 --- a/configure.ac +++ b/configure.ac @@ -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) -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) if test x$enable_upstart_monitoring = xyes; then PKG_CHECK_MODULES(DBUS, [dbus-1]) diff --git a/src/main.c b/src/main.c index b06d29cb..a6f0b017 100644 --- a/src/main.c +++ b/src/main.c @@ -1166,17 +1166,6 @@ on_hide_splash (state_t *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 quit_program (state_t *state) { @@ -1192,13 +1181,6 @@ quit_program (state_t *state) 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) { ply_trigger_pull (state->deactivate_trigger, NULL); state->deactivate_trigger = NULL; -- 2.47.3