Silence error message on initial installation when /etc/default/grub does not yet exist.

This commit is contained in:
Colin Watson 2013-11-25 12:26:17 +00:00
parent e854fc5f9e
commit f7319022b5
2 changed files with 3 additions and 1 deletions

2
debian/changelog vendored
View File

@ -49,6 +49,8 @@ grub2 (2.00+20131203-1) UNRELEASED; urgency=low
* Run tests with LC_CTYPE=C.UTF-8, so that grub-fs-tester can handle UTF-8 * Run tests with LC_CTYPE=C.UTF-8, so that grub-fs-tester can handle UTF-8
data correctly. data correctly.
* Update debian/legacy/update-grub to the version from grub 0.97-67. * Update debian/legacy/update-grub to the version from grub 0.97-67.
* Silence error message on initial installation when /etc/default/grub
does not yet exist.
-- Colin Watson <cjwatson@debian.org> Fri, 15 Nov 2013 10:18:57 +0000 -- Colin Watson <cjwatson@debian.org> Fri, 15 Nov 2013 10:18:57 +0000

2
debian/config.in vendored
View File

@ -65,7 +65,7 @@ case @PACKAGE@ in
fi fi
if [ "${GRUB_HIDDEN_TIMEOUT}" != "" ]; then if [ "${GRUB_HIDDEN_TIMEOUT}" != "" ]; then
db_set grub-pc/hidden_timeout true db_set grub-pc/hidden_timeout true
elif egrep -q '^#?[[:space:]]*GRUB_HIDDEN_TIMEOUT=' /etc/default/grub; then elif egrep -qs '^#?[[:space:]]*GRUB_HIDDEN_TIMEOUT=' /etc/default/grub; then
db_set grub-pc/hidden_timeout false db_set grub-pc/hidden_timeout false
fi fi
;; ;;