proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-07-27 04:39:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add "splash" to default boot options on Ubuntu.

Browse Source
This commit is contained in:
Colin Watson 2013-01-29 06:33:17 +00:00
parent 1666f0087a
commit 537c70e5cf
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -22,6 +22,7 @@ grub2 (2.00-13) UNRELEASED; urgency=low
- Generate configuration for signed UEFI kernels if available. - Generate configuration for signed UEFI kernels if available.
- On Ubuntu amd64, add a raw-uefi custom upload tarball for signing. - On Ubuntu amd64, add a raw-uefi custom upload tarball for signing.
- Install signed images if available and UEFI Secure Boot is enabled. - Install signed images if available and UEFI Secure Boot is enabled.
- Add "splash" to default boot options on Ubuntu.
-- Colin Watson <cjwatson@debian.org> Mon, 28 Jan 2013 11:08:07 +0000 -- Colin Watson <cjwatson@debian.org> Mon, 28 Jan 2013 11:08:07 +0000

2
debian/default/grub vendored
View File

@ -6,7 +6,7 @@
GRUB_DEFAULT=0 GRUB_DEFAULT=0
GRUB_TIMEOUT=5 GRUB_TIMEOUT=5
GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` 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="" GRUB_CMDLINE_LINUX=""
# Uncomment to enable BadRAM filtering, modify to suit your needs # Uncomment to enable BadRAM filtering, modify to suit your needs

9
debian/rules vendored
View File

@ -52,6 +52,12 @@ else
$(error COMMON_PLATFORM not set for $(DEB_HOST_ARCH_CPU)) $(error COMMON_PLATFORM not set for $(DEB_HOST_ARCH_CPU))
endif endif
ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
DEFAULT_CMDLINE := quiet splash
else
DEFAULT_CMDLINE := quiet
endif
%: %:
dh $@ --parallel dh $@ --parallel
@ -168,6 +174,7 @@ platform_subst = \
sed debian/$(1) \ sed debian/$(1) \
-e "s/@PACKAGE@/$(2)/g" \ -e "s/@PACKAGE@/$(2)/g" \
-e "s/@CPU_PLATFORM@/$$cpu_platform/g" \ -e "s/@CPU_PLATFORM@/$$cpu_platform/g" \
-e "s/@DEFAULT_CMDLINE@/$(DEFAULT_CMDLINE)/g" \
>> debian/$(2).$(3); \ >> debian/$(2).$(3); \
fi fi
@ -301,6 +308,8 @@ override_dh_install:
done done
dh_install -pgrub-emu --sourcedir=debian/tmp-grub-emu dh_install -pgrub-emu --sourcedir=debian/tmp-grub-emu
dh_install -pgrub-emu-dbg --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)) ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
ifneq (,$(filter grub-pc,$(BUILD_PACKAGES))) ifneq (,$(filter grub-pc,$(BUILD_PACKAGES)))
patch debian/grub-pc/usr/lib/grub-legacy/update-grub \ patch debian/grub-pc/usr/lib/grub-legacy/update-grub \

4
debian/templates.in vendored
View File

@ -7,7 +7,7 @@ _Description: Linux command line:
Template: grub2/linux_cmdline_default Template: grub2/linux_cmdline_default
Type: string Type: string
Default: quiet Default: @DEFAULT_CMDLINE@
_Description: Linux default command line: _Description: Linux default command line:
The following string will be used as Linux parameters for the default menu The following string will be used as Linux parameters for the default menu
entry but not for the recovery mode. entry but not for the recovery mode.
@ -23,7 +23,7 @@ _Description: kFreeBSD command line:
# still unused # still unused
Template: grub2/kfreebsd_cmdline_default Template: grub2/kfreebsd_cmdline_default
Type: string Type: string
Default: quiet Default: @DEFAULT_CMDLINE@
_Description: kFreeBSD default command line: _Description: kFreeBSD default command line:
The following string will be used as kFreeBSD parameters for the default menu The following string will be used as kFreeBSD parameters for the default menu
entry but not for the recovery mode. entry but not for the recovery mode.