From 537c70e5cfc9f71c84e55d45e53f6e549cdb253b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 29 Jan 2013 06:33:17 +0000 Subject: [PATCH] Add "splash" to default boot options on Ubuntu. --- debian/changelog | 1 + debian/default/grub | 2 +- debian/rules | 9 +++++++++ debian/templates.in | 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 68318586c..3bf25b6a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ grub2 (2.00-13) UNRELEASED; urgency=low - Generate configuration for signed UEFI kernels if available. - On Ubuntu amd64, add a raw-uefi custom upload tarball for signing. - Install signed images if available and UEFI Secure Boot is enabled. + - Add "splash" to default boot options on Ubuntu. -- Colin Watson Mon, 28 Jan 2013 11:08:07 +0000 diff --git a/debian/default/grub b/debian/default/grub index b3a34671a..eb662a55a 100644 --- a/debian/default/grub +++ b/debian/default/grub @@ -6,7 +6,7 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` -GRUB_CMDLINE_LINUX_DEFAULT="quiet" +GRUB_CMDLINE_LINUX_DEFAULT="@DEFAULT_CMDLINE@" GRUB_CMDLINE_LINUX="" # Uncomment to enable BadRAM filtering, modify to suit your needs diff --git a/debian/rules b/debian/rules index b21973916..aee9c0541 100755 --- a/debian/rules +++ b/debian/rules @@ -52,6 +52,12 @@ else $(error COMMON_PLATFORM not set for $(DEB_HOST_ARCH_CPU)) endif +ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) +DEFAULT_CMDLINE := quiet splash +else +DEFAULT_CMDLINE := quiet +endif + %: dh $@ --parallel @@ -168,6 +174,7 @@ platform_subst = \ sed debian/$(1) \ -e "s/@PACKAGE@/$(2)/g" \ -e "s/@CPU_PLATFORM@/$$cpu_platform/g" \ + -e "s/@DEFAULT_CMDLINE@/$(DEFAULT_CMDLINE)/g" \ >> debian/$(2).$(3); \ fi @@ -301,6 +308,8 @@ override_dh_install: done dh_install -pgrub-emu --sourcedir=debian/tmp-grub-emu dh_install -pgrub-emu-dbg --sourcedir=debian/tmp-grub-emu + sed -i -e "s/@DEFAULT_CMDLINE@/$(DEFAULT_CMDLINE)/g" \ + debian/grub2-common/usr/share/grub/default/grub ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) ifneq (,$(filter grub-pc,$(BUILD_PACKAGES))) patch debian/grub-pc/usr/lib/grub-legacy/update-grub \ diff --git a/debian/templates.in b/debian/templates.in index 51aa89628..c8326f6b5 100644 --- a/debian/templates.in +++ b/debian/templates.in @@ -7,7 +7,7 @@ _Description: Linux command line: Template: grub2/linux_cmdline_default Type: string -Default: quiet +Default: @DEFAULT_CMDLINE@ _Description: Linux default command line: The following string will be used as Linux parameters for the default menu entry but not for the recovery mode. @@ -23,7 +23,7 @@ _Description: kFreeBSD command line: # still unused Template: grub2/kfreebsd_cmdline_default Type: string -Default: quiet +Default: @DEFAULT_CMDLINE@ _Description: kFreeBSD default command line: The following string will be used as kFreeBSD parameters for the default menu entry but not for the recovery mode.