diff -Nru plymouth-0.9.4git20200323/debian/changelog plymouth-0.9.4git20200323/debian/changelog --- plymouth-0.9.4git20200323/debian/changelog 2020-09-30 22:01:26.000000000 +0800 +++ plymouth-0.9.4git20200323/debian/changelog 2020-11-02 18:02:17.000000000 +0800 @@ -1,3 +1,15 @@ +plymouth (0.9.4git20200323-0ubuntu6.2) focal; urgency=medium + + * debian/patches/timeout-for-ping.patch: Raise the ping timeout from 2 to + 30 seconds. Two seconds was way too short, + - causing ping to randomly fail on some busy multi-monitor start-ups, + - causing gdm to think no plymouthd is running, + - causing gdm to never call 'plymouth deactivate', + - causing plymouthd to retain ownership of the graphics hardware, + - causing gdm's login screen to fail to start. (LP: #1872159) + + -- Daniel van Vugt Mon, 02 Nov 2020 18:02:17 +0800 + plymouth (0.9.4git20200323-0ubuntu6.1) focal; urgency=medium * Clear twostep footer, at the end of fsck, and clear lingering Ctrl+C diff -Nru plymouth-0.9.4git20200323/debian/patches/timeout-for-ping.patch plymouth-0.9.4git20200323/debian/patches/timeout-for-ping.patch --- plymouth-0.9.4git20200323/debian/patches/timeout-for-ping.patch 2020-03-23 20:06:52.000000000 +0800 +++ plymouth-0.9.4git20200323/debian/patches/timeout-for-ping.patch 2020-11-02 18:02:17.000000000 +0800 @@ -1,18 +1,18 @@ Description: Don't wait forever for a ping reply. In the event that plymouthd is not responding the plymouth client will wait forever when sending a ping to the daemon. Instead of waiting forever timeout - after a couple of seconds. + after a while. -Origin: vendor +Origin: Ubuntu Author: Brian Murray -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1705345 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1705345, https://bugs.launchpad.net/bugs/1872159 Forwarded: no -Last-Update: 2018-03-29 +Last-Update: 2020-10-21 -Index: plymouth-0.9.4git20200109/src/client/plymouth.c +Index: plymouth_0.9.4git20200323-0ubuntu6.2/src/client/plymouth.c =================================================================== ---- plymouth-0.9.4git20200109.orig/src/client/plymouth.c -+++ plymouth-0.9.4git20200109/src/client/plymouth.c +--- plymouth_0.9.4git20200323-0ubuntu6.2.orig/src/client/plymouth.c ++++ plymouth_0.9.4git20200323-0ubuntu6.2/src/client/plymouth.c @@ -75,6 +75,13 @@ typedef struct char *keys; } key_answer_state_t; @@ -31,7 +31,7 @@ on_success, (ply_boot_client_response_handler_t) on_failure, &state); -+ ply_event_loop_watch_for_timeout (state.loop, 2.0, ++ ply_event_loop_watch_for_timeout (state.loop, 30.0, + timeout_handler, state.loop); } else if (should_check_for_active_vt) { ply_boot_client_ask_daemon_has_active_vt (state.client,