From 2c3854b1baf375421c4b53f7ff82ba94948b3bd1 Mon Sep 17 00:00:00 2001 From: tranch Date: Mon, 27 Jul 2026 23:03:06 +0800 Subject: fix: sync branding and suspend audio --- installer/branding/sidebar-logo.png | Bin 4425 -> 4105 bytes .../apps/org.fedoraproject.AnacondaInstaller.svg | 4 ++-- .../apps/org.fedoraproject.AnacondaInstaller.svg | 4 ++-- .../org.fedoraproject.AnacondaInstaller-symbolic.svg | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'installer') diff --git a/installer/branding/sidebar-logo.png b/installer/branding/sidebar-logo.png index 0f47606..bd877c4 100644 Binary files a/installer/branding/sidebar-logo.png and b/installer/branding/sidebar-logo.png differ diff --git a/installer/system_files/overrides/usr/share/icons/hicolor/48x48/apps/org.fedoraproject.AnacondaInstaller.svg b/installer/system_files/overrides/usr/share/icons/hicolor/48x48/apps/org.fedoraproject.AnacondaInstaller.svg index 04454b7..c28ad47 100644 --- a/installer/system_files/overrides/usr/share/icons/hicolor/48x48/apps/org.fedoraproject.AnacondaInstaller.svg +++ b/installer/system_files/overrides/usr/share/icons/hicolor/48x48/apps/org.fedoraproject.AnacondaInstaller.svg @@ -26,8 +26,8 @@ - - + + diff --git a/installer/system_files/overrides/usr/share/icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller.svg b/installer/system_files/overrides/usr/share/icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller.svg index 04454b7..c28ad47 100644 --- a/installer/system_files/overrides/usr/share/icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller.svg +++ b/installer/system_files/overrides/usr/share/icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller.svg @@ -26,8 +26,8 @@ - - + + diff --git a/installer/system_files/overrides/usr/share/icons/hicolor/symbolic/apps/org.fedoraproject.AnacondaInstaller-symbolic.svg b/installer/system_files/overrides/usr/share/icons/hicolor/symbolic/apps/org.fedoraproject.AnacondaInstaller-symbolic.svg index f8dedad..f9db423 100644 --- a/installer/system_files/overrides/usr/share/icons/hicolor/symbolic/apps/org.fedoraproject.AnacondaInstaller-symbolic.svg +++ b/installer/system_files/overrides/usr/share/icons/hicolor/symbolic/apps/org.fedoraproject.AnacondaInstaller-symbolic.svg @@ -7,7 +7,7 @@ - - + + -- cgit v1.2.3 From 3a066cbf78aabf2e2e013e5a9a911ba7f37eed27 Mon Sep 17 00:00:00 2001 From: tranch Date: Mon, 27 Jul 2026 13:34:03 +0800 Subject: Preserve GRUB selection timeout Hide the target GRUB menu through menu_auto_hide while keeping the image-provided timeout. This leaves users time to choose rollback or other boot entries when they explicitly reveal the menu. Verified with bash -n and git diff --check. --- installer/configure-target-grub.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'installer') diff --git a/installer/configure-target-grub.sh b/installer/configure-target-grub.sh index 2f16692..a0aa756 100755 --- a/installer/configure-target-grub.sh +++ b/installer/configure-target-grub.sh @@ -9,15 +9,6 @@ if [[ ! -d "${target_root}/etc" || ! -d "${target_root}/usr" ]]; then exit 1 fi -grub_defaults="${target_root}/etc/default/grub" -mkdir -p "$(dirname "${grub_defaults}")" - -if [[ -f "${grub_defaults}" ]] && grep -q '^GRUB_TIMEOUT=' "${grub_defaults}"; then - sed -i 's/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=0/' "${grub_defaults}" -else - printf 'GRUB_TIMEOUT=0\n' >> "${grub_defaults}" -fi - grub_editenv="" for candidate in \ "${target_root}/usr/bin/grub2-editenv" \ @@ -86,4 +77,6 @@ fi chroot "${target_root}" "${grub_mkconfig}" -o "${grub_config}" -echo "Configured target GRUB: GRUB_TIMEOUT=0, menu_auto_hide=1, ${grub_config}" +# Preserve the target image's GRUB timeout so users have time to choose an +# entry after explicitly showing the otherwise hidden menu. +echo "Configured target GRUB: menu_auto_hide=1, ${grub_config}" -- cgit v1.2.3