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

Make grub-mkconfig shut up about grep's stdout

Browse Source
This commit is contained in:
Adam Conrad 2012-03-05 07:59:48 -07:00
parent 35d7529836
commit 955ad9c000
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -1,5 +1,10 @@
grub2 (1.99-15) UNRELEASED; urgency=low grub2 (1.99-15) UNRELEASED; urgency=low
[ Adam Conrad ]
* grub.cfg_400.patch: Redirect grep stdout to /dev/null since
grub-mkconfig is "exec > grub.cfg.new", which causes grep's input
and output to be the same FD (LP: #934269) (closes: #652972)
[ Colin Watson ] [ Colin Watson ]
* no_libzfs.patch: Use xasprintf rather than asprintf. * no_libzfs.patch: Use xasprintf rather than asprintf.
* Backport from upstream: * Backport from upstream:

2
debian/patches/grub.cfg_400.patch vendored
View File

@ -6,7 +6,7 @@ Index: b/util/grub-mkconfig.in
esac esac
done done
+if [ "x${grub_cfg}" != "x" ] && ! grep -q "^password " ${grub_cfg}.new ; then +if [ "x${grub_cfg}" != "x" ] && ! grep "^password " ${grub_cfg}.new >/dev/null; then
+ chmod 444 ${grub_cfg}.new || true + chmod 444 ${grub_cfg}.new || true
+fi +fi
+ +