Skip to content
This repository has been archived by the owner on Aug 11, 2023. It is now read-only.

Commit

Permalink
Fix splash handling with systemd-ukify
Browse files Browse the repository at this point in the history
Fixes: 598988e
  • Loading branch information
andreyv committed Aug 2, 2023
1 parent 598988e commit 1bd9722
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion sbupdate
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ function load_config() {
[[ -d "${ESP_DIR}" ]] || error "${ESP_DIR} does not exist"
[[ -n "${CMDLINE_DEFAULT:+x}" ]] || error "CMDLINE_DEFAULT is not defined or empty"

# Backwards compatibility
[[ "${SPLASH}" == "/dev/null" ]] && SPLASH=""

local key=("${KEY_DIR}"/@(DB|db).key); readonly KEY="${key[0]}"
local cert=("${KEY_DIR}"/@(DB|db).crt); readonly CERT="${cert[0]}"

Expand Down Expand Up @@ -152,7 +155,7 @@ function update_image() {
"${initrd_all[@]/#/--initrd=}" \
--cmdline="${cmdline}" \
--os-release=@"/etc/os-release" \
--splash="${SPLASH}" \
${SPLASH:+--splash="${SPLASH}"} \
"${UFLAGS[@]}" \
--output "${output}"

Expand Down
2 changes: 1 addition & 1 deletion sbupdate.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# KEY_DIR Directory with the custom Secure Boot keys
# ESP_DIR EFI System Partition location
# OUT_DIR Relative path on ESP for signed kernel images
# SPLASH Splash image file. Use "/dev/null" to disable splash.
# SPLASH Splash image file. Use an empty string to disable splash.
# BACKUP Whether to back up old signed kernel images
# EXTRA_SIGN An array of additional files to sign
# CMDLINE_DEFAULT Default kernel command line. Read from /etc/kernel/cmdline
Expand Down

0 comments on commit 1bd9722

Please sign in to comment.