From 21a37187f5554c05e1bc3b08eead569a7d3c73ad Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 29 Jan 2013 05:31:42 +0000 Subject: [PATCH] Stop using the /usr/share/images/desktop-base/desktop-grub.png alternative as the fallback background if GRUB_DISTRIBUTOR is "Ubuntu". --- debian/changelog | 2 ++ debian/grub.d/05_debian_theme | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 741cc50d5..32c01a1b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ grub2 (2.00-13) UNRELEASED; urgency=low * Backport from upstream: - Fix booting FreeBSD >= 9.1 amd64 kernels (closes: #699002). + * Stop using the /usr/share/images/desktop-base/desktop-grub.png + alternative as the fallback background if GRUB_DISTRIBUTOR is "Ubuntu". -- Colin Watson Mon, 28 Jan 2013 11:08:07 +0000 diff --git a/debian/grub.d/05_debian_theme b/debian/grub.d/05_debian_theme index 95d7aa641..e97783554 100755 --- a/debian/grub.d/05_debian_theme +++ b/debian/grub.d/05_debian_theme @@ -160,7 +160,8 @@ if set_background_image "${WALLPAPER}" "${COLOR_NORMAL}" "${COLOR_HIGHLIGHT}"; t fi # If we haven't found a background image yet, use the default from desktop-base. -if set_background_image "/usr/share/images/desktop-base/desktop-grub.png"; then +if [ "$GRUB_DISTRIBUTOR" != Ubuntu ] && \ + set_background_image "/usr/share/images/desktop-base/desktop-grub.png"; then exit 0 fi