splash: add shutdown splash
AcceptedPublic
Actions

Authored by quentin.thebault_defenso.fr on Fri, Feb 6, 7:39 AM.

Details

Reviewers

kevans
vexeduxr
manu
ziaee

Group Reviewers

manpages

Summary

This commit adds a shutdown splash to the existing kernel startup splash(4)
screen feature. It can be customized by providing a PNG image to the
shutdown_splash directive loader.conf(5).

Sponsored by: Defenso
MFC after: 2 weeks

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 70463
Build 67346: arc lint + arc unit

Event Timeline

quentin.thebault_defenso.fr created this revision.Fri, Feb 6, 7:39 AM

Herald added subscribers: ziaee, olce, dab and 2 others. · View Herald TranscriptFri, Feb 6, 7:39 AM

quentin.thebault_defenso.fr requested review of this revision.Fri, Feb 6, 7:39 AM

Harbormaster completed remote builds in B70463: Diff 171319.Fri, Feb 6, 7:39 AM

Awesome.
But I don't think that we should add a new kernel option, just put everything depending on DEV_SPLASH.
Otherwise everything looks ok.

This revision now requires changes to proceed.Sat, Feb 7, 7:48 AM

imp added inline comments.Sat, Feb 7, 3:04 PM

stand/common/gfx_fb.c
3101	Did you build all the bootloaders? I think there is a copy of this in the stube version of this file. tools/boot/universe.sh is a script to build them all fast.

Remove SHUTDOWN_SPLASH option and merge into DEV_SPLASH

Harbormaster completed remote builds in B70579: Diff 171639.Tue, Feb 10, 1:48 PM

quentin.thebault_defenso.fr marked an inline comment as done.Tue, Feb 10, 1:49 PM

quentin.thebault_defenso.fr added inline comments.

stand/common/gfx_fb.c

3101

Yes, done. Everything succeeds.

$ make universe
Building /usr/obj/usr/src/amd64.amd64/stand/universe
Building aarch64 WITHOUT_FORTH=yes ... Success
Building amd64 WITHOUT_FORTH=yes ... Success
Building i386 WITHOUT_FORTH=yes ... Success
Building aarch64 WITHOUT_LOADER_GELI=yes ... Success
Building amd64 WITHOUT_LOADER_GELI=yes ... Success
Building i386 WITHOUT_LOADER_GELI=yes ... Success
Building amd64  ... Success
Building armv7  ... Success
Building aarch64  ... Success
Building i386  ... Success
Building powerpc  ... Success
Building powerpc64  ... Success
Building powerpc64le  ... Success
Building riscv64  ... Success
Building aarch64 MK_LOADER_ZFS=no ... Success
Building amd64 MK_LOADER_ZFS=no ... Success
Building i386 MK_LOADER_ZFS=no ... Success
Building amd64 MK_LOADER_BIOS_TEXTONLY=no ... Success
Building i386 MK_LOADER_BIOS_TEXTONLY=no ... Success

Thanks, can you reword the commit message ? otherwise looks good to me.

Amend commit message.

Harbormaster completed remote builds in B70653: Diff 171849.Fri, Feb 13, 6:40 AM

I submitted a pull requeston GitHub for this diff: https://github.com/freebsd/freebsd-src/pull/2021

splash is set to /boot/images/freebsd-logo-rev.png by default. Should the same be done for the shutdown splash?

sys/dev/vt/vt_core.c
1838	This can be fixed before landing, just noting it here.

In D55140#1264381, @vexeduxr wrote:

splash is set to /boot/images/freebsd-logo-rev.png by default. Should the same be done for the shutdown splash?

This is already the case since we call into the existing vtterm_splash code where this case is handled.

The manual looks good to me!

In D55140#1264432, @quentin.thebault_defenso.fr wrote:

In D55140#1264381, @vexeduxr wrote:

splash is set to /boot/images/freebsd-logo-rev.png by default. Should the same be done for the shutdown splash?

This is already the case since we call into the existing vtterm_splash code where this case is handled.

I'm not talking about the default bitmap that's used if no splash is provided.
stand/defaults/loader.conf sets splash to /boot/images/freebsd-logo-rev.png, they're different.

Add default conf for shutdown splash image in stand/defaults/loader.conf
Fix style in vt_core.c

Harbormaster completed remote builds in B70693: Diff 171965.Mon, Feb 16, 1:23 PM

quentin.thebault_defenso.fr marked an inline comment as done.Mon, Feb 16, 1:26 PM

olce added inline comments.Mon, Feb 16, 1:40 PM

share/man/man4/splash.4
319–320	This is grafted to a sentence about adding PNG support, which seems unrelated (BMP or PCX would be supported as well, right?). So, instead, a separate sentence saying that `splash` was extended to display a picture at shutdown?

quentin.thebault_defenso.fr added inline comments.Mon, Feb 16, 2:14 PM

share/man/man4/splash.4
319–320	This is voluntary: the extension for shutdown is only provided for vt(4), which only supports PNG. BMP and PCX are only supported by syscons(4).