lp://qastaging/plymouth
- Get this branch:
- bzr branch lp://qastaging/plymouth
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.freedesktop.org/plymouth.
Last successful import was .
Recent revisions
- 1861. By Iain Lane
-
Merge branch 'fix-deactivate
-udev-race' into 'master' device-manager: don't watch for udev events when deactivated
See merge request plymouth/plymouth!5
- 1860. By Ray Strode
-
Merge branch 'wip/dont-
muck-with- login-screen- tty' into 'master' main: ensure tty is closed on deactivate
See merge request plymouth/plymouth!2
- 1859. By Ray Strode
-
Merge branch 'wip/container-
condition- check' into 'master' systemd-units: Add "ConditionVirtu
alization= !container" Closes #27
See merge request plymouth/plymouth!1
- 1857. By Ray Strode <email address hidden>
-
two-step: add unhandled splash mode case to switch
This fixes a compiler warning.
- 1856. By Ray Strode <email address hidden>
-
main: fix build
I slightly modified Hans patch in commit 129b4a50 before pushing it
and broke the build.This fixes the build by adding a forward declaration.
- 1855. By Hans de Goede <email address hidden>
-
Fix miscellaneous compiler warnings
Fix all compiler warnings (and one type) except for the deprectation warnings
for the gdk_screen_get_monitor_ * functions used in the x11 renderer. Signed-off-by: Hans de Goede <email address hidden>
- 1854. By Hans de Goede <email address hidden>
-
configure: Pass -Wno-cast-
function- type if available plymouth uses function type casts for callbacks in quite a few places, fixing
these needlessly complicates the code, so lets pass -Wno-cast-function- type. This fixes 218 warnings like this one:
ply-command-
parser. c: In function ‘ply_ command_ parser_ stop_parsing_ arguments†™:
ply-command-parser. c:680:48: warning: cast between incompatible function types from ‘void (*)(ply_ command_ parser_ t *)’ {aka ‘void (*)(struct _ply_command_parser *)’} to ‘void (*)(void *, int, ply_event_loop_t *)’ {aka ‘void (*)(void *, int, struct _ply_event_loop *)’} [-Wcast- function- type]
( ply_event_ loop_exit_ handler_ t) Signed-off-by: Hans de Goede <email address hidden>
- 1853. By Hans de Goede <email address hidden>
-
main: Fix getting detailed logs from systemd
This are 3 issues with the detailed logs handling:
1) plymouth attaches to the session directly on a show-splash command
(in on_show_splash()), but it does not tell systemd to start printing
details until the splash is actually shown after the splash_delay.2) If the splash is actually shown during the initrd (e.g. a diskcript
password is necessary) then we tell the initrd systemd instance to
print details, but we don't tell the regular initrd instance which takes
over as pid 1 after the switch-root to print details.This leads to rather inconsistent logging/printing behavior, e.g.:
* If a diskcrypt password is asked for, we only log details from
the initrd phase.* If the boot is shorter then splash_delay no details are logged
* If the user presses ESC during boot during the initrd, only initrd
messages are printed* If the user presses ESC during boot after the initrd, only normal
messages are printedThis commit fixes both these issues by:
1) Telling systemd to print details as soon as we have attached to the session;
and to stop printing details when we detach from the session (*)
2) Telling systemd to print details after the rootfs has been remounted rw*) This is necessary to have a smooth transition to e.g. gdm if the splash
has not shown because the boot is shorter then splash_delaySigned-off-by: Hans de Goede <email address hidden>
- 1852. By Hans de Goede <email address hidden>
-
main: Show details when ESC is pressed during splash_delay
Start listening for keypresses on the first show_splash() call, so that
pressing ESC while we're delaying show the non-details splash will show
the details splash.Signed-off-by: Hans de Goede <email address hidden>
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)