From d68d01573b7212b986214067cf2d1a3f938438cb Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sun, 22 Sep 2013 21:47:52 +0400
Subject: [PATCH] * util/grub-install.in: Add --grub-editenv option. 	*
 util/grub-install_header (grub_compress_file): Explicitly check for 	plain
 file to avoid cp error.

---
 ChangeLog                |  6 ++++++
 util/grub-install.in     |  6 ++++++
 util/grub-install_header | 10 +++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 52f8e13ed..2280fde58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-22  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* util/grub-install.in: Add --grub-editenv option.
+	* util/grub-install_header (grub_compress_file): Explicitly check for
+	plain file to avoid cp error.
+
 2013-09-22  Andrey Borzenkov <arvidjaar@gmail.com>
 
 	* docs/grub.texi (Device syntax): Document new LVM UUID based device
diff --git a/util/grub-install.in b/util/grub-install.in
index 1816bb1f2..acd516f2c 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -75,6 +75,7 @@ usage () {
     print_option_help "--grub-setup=$(gettext "FILE")" "$(gettext "use FILE as grub-setup")"
     print_option_help "--grub-mkrelpath=$(gettext "FILE")" "$(gettext "use FILE as grub-mkrelpath")"
     print_option_help "--grub-probe=$(gettext "FILE")" "$(gettext "use FILE as grub-probe")"
+    print_option_help "--grub-editenv=$(gettext "FILE")" "$(gettext "use FILE as grub-editenv")"
     # TRANSLATORS: "may break" doesn't just mean that option wouldn't have any
     # effect but that it will make the resulting install unbootable from HDD.
     print_option_help "--allow-floppy" "$(gettext "make the drive also bootable as floppy (default for fdX devices). May break on some BIOSes.")"
@@ -173,6 +174,11 @@ do
     --grub-probe=*)
 	grub_probe="`echo "$option" | sed 's/--grub-probe=//'`" ;;
 
+    --grub-editenv)
+	    grub_editenv="`argument "$option" "$@"`"; shift;;
+    --grub-editenv=*)
+	grub_editenv="`echo "$option" | sed 's/--grub-editenv=//'`" ;;
+
     --no-floppy)
 	;;
     --recheck)
diff --git a/util/grub-install_header b/util/grub-install_header
index cf7fa9d0e..26013fe59 100644
--- a/util/grub-install_header
+++ b/util/grub-install_header
@@ -45,10 +45,14 @@ handler.lst video.lst crypto.lst terminal.lst"
 grub_mkimage="${bindir}/@grub_mkimage@"
 
 grub_compress_file () {
-    if [ "$compressor" != "" ] ; then
-        "$compressor" $compressor_opts "$1" > "$2"
+    if [ -f "$1" ] ; then
+	if [ "$compressor" != "" ] ; then
+	    "$compressor" $compressor_opts "$1" > "$2"
+	else
+	    cp -f "$1" "$2"
+	fi
     else
-        cp -f "$1" "$2"
+	gettext_printf "Skipping file \`%s': not a plain file\n" "$1" 1>&2
     fi
 }