Stop using the /usr/share/images/desktop-base/desktop-grub.png

alternative as the fallback background if GRUB_DISTRIBUTOR is "Ubuntu".
This commit is contained in:
Colin Watson 2013-01-29 05:31:42 +00:00
parent 1dcca7d52b
commit 21a37187f5
2 changed files with 4 additions and 1 deletions

2
debian/changelog vendored
View File

@ -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 <cjwatson@debian.org> Mon, 28 Jan 2013 11:08:07 +0000

View File

@ -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