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

Enable hidden timeout support by default.

Browse Source
This commit is contained in:
Colin Watson 2013-11-13 01:09:42 +00:00 committed by Colin Watson
parent 67f530b777
commit 84c4b591b6
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -24,6 +24,7 @@ grub2 (2.00-20) UNRELEASED; urgency=low
+ In recovery mode, add nomodeset to the Linux kernel arguments, and + In recovery mode, add nomodeset to the Linux kernel arguments, and
remove the 'set gfxpayload=keep' command. remove the 'set gfxpayload=keep' command.
+ Set default timeout to 10 seconds. + Set default timeout to 10 seconds.
+ Enable hidden timeout support by default.
-- Colin Watson <cjwatson@debian.org> Mon, 07 Oct 2013 09:48:53 +0100 -- Colin Watson <cjwatson@debian.org> Mon, 07 Oct 2013 09:48:53 +0100

6
debian/rules vendored
View File

@ -55,6 +55,7 @@ endif
ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
DEFAULT_CMDLINE := quiet splash DEFAULT_CMDLINE := quiet splash
DEFAULT_TIMEOUT := 10 DEFAULT_TIMEOUT := 10
DEFAULT_HIDDEN_TIMEOUT := 0
confflags += \ confflags += \
--enable-ubuntu-recovery \ --enable-ubuntu-recovery \
--enable-quiet-boot \ --enable-quiet-boot \
@ -67,6 +68,7 @@ substvars := \
else else
DEFAULT_CMDLINE := quiet DEFAULT_CMDLINE := quiet
DEFAULT_TIMEOUT := 5 DEFAULT_TIMEOUT := 5
DEFAULT_HIDDEN_TIMEOUT :=
substvars := substvars :=
endif endif
@ -337,6 +339,10 @@ override_dh_install:
-e "s/@DEFAULT_CMDLINE@/$(DEFAULT_CMDLINE)/g" \ -e "s/@DEFAULT_CMDLINE@/$(DEFAULT_CMDLINE)/g" \
-e "s/@DEFAULT_TIMEOUT@/$(DEFAULT_TIMEOUT)/g" \ -e "s/@DEFAULT_TIMEOUT@/$(DEFAULT_TIMEOUT)/g" \
debian/grub2-common/usr/share/grub/default/grub debian/grub2-common/usr/share/grub/default/grub
ifneq (,$(DEFAULT_HIDDEN_TIMEOUT))
perl -pi -e 's/^GRUB_TIMEOUT=.*/GRUB_HIDDEN_TIMEOUT=0\nGRUB_HIDDEN_TIMEOUT_QUIET=true\n$$&/' \
debian/grub2-common/usr/share/grub/default/grub
endif
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 \