vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-install.in: Add --grub-editenv option.

Browse source 
* util/grub-install_header (grub_compress_file): Explicitly check for
	plain file to avoid cp error.
This commit is contained in:
Andrey Borzenkov 2013-09-22 21:47:52 +04:00
parent 775b284dd6
commit d68d01573b
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2013-09-22 Andrey Borzenkov <arvidjaar@gmail.com>
* docs/grub.texi (Device syntax): Document new LVM UUID based device * docs/grub.texi (Device syntax): Document new LVM UUID based device

6
util/grub-install.in
View file

@ -75,6 +75,7 @@ usage () {
print_option_help "--grub-setup=$(gettext "FILE")" "$(gettext "use FILE as grub-setup")" 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-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-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 # 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. # 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.")" 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=*)
grub_probe="`echo "$option" | sed 's/--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) --no-floppy)
;; ;;
--recheck) --recheck)

10
util/grub-install_header
View file

@ -45,10 +45,14 @@ handler.lst video.lst crypto.lst terminal.lst"
grub_mkimage="${bindir}/@grub_mkimage@" grub_mkimage="${bindir}/@grub_mkimage@"
grub_compress_file () { grub_compress_file () {
if [ "$compressor" != "" ] ; then if [ -f "$1" ] ; then
"$compressor" $compressor_opts "$1" > "$2" if [ "$compressor" != "" ] ; then
"$compressor" $compressor_opts "$1" > "$2"
else
cp -f "$1" "$2"
fi
else else
cp -f "$1" "$2" gettext_printf "Skipping file \`%s': not a plain file\n" "$1" 1>&2
fi fi
} }