6
6
+++ b/util/grub-install.in
9
grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
10
grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
11
-grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
12
grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
13
grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
16
instead of the root directory
9
grub_setup="${sbindir}/`echo grub-setup | sed ${transform}`"
10
grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
11
-grub_mkdevicemap="${sbindir}/`echo grub-mkdevicemap | sed ${transform}`"
12
grub_probe="${sbindir}/`echo grub-probe | sed ${transform}`"
13
grub_editenv="${bindir}/`echo grub-editenv | sed ${transform}`"
14
grub_mkrelpath="${bindir}/`echo grub-mkrelpath | sed ${transform}`"
17
16
--grub-setup=FILE use FILE as grub-setup
18
17
--grub-mkimage=FILE use FILE as grub-mkimage
18
--grub-mkrelpath=FILE use FILE as grub-mkrelpath
19
19
- --grub-mkdevicemap=FILE use FILE as grub-mkdevicemap
20
20
--grub-probe=FILE use FILE as grub-probe
21
21
--no-floppy do not probe any floppy drive
22
--recheck probe a device map even if it already exists
24
grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
22
--allow-floppy Make the drive also bootable as floppy
24
grub_mkrelpath="`echo "$option" | sed 's/--grub-mkrelpath=//'`" ;;
26
26
--grub-mkdevicemap)
27
- grub_mkdevicemap=`argument $option "$@"`; shift;;
27
- grub_mkdevicemap="`argument "$option" "$@"`"; shift;;
28
28
+ : ;; # compatibility only
29
29
--grub-mkdevicemap=*)
30
- grub_mkdevicemap=`echo "$option" | sed 's/--grub-mkdevicemap=//'` ;;
30
- grub_mkdevicemap="`echo "$option" | sed 's/--grub-mkdevicemap=//'`" ;;
31
31
+ : ;; # compatibility only
34
grub_probe=`argument $option "$@"`; shift;;
34
grub_probe="`argument "$option" "$@"`"; shift;;
39
-set $grub_mkdevicemap dummy
39
-set "$grub_mkdevicemap" dummy
40
40
-if test -f "$1"; then
47
# Create the GRUB directory if it is not present.
48
mkdir -p "$grubdir" || exit 1
47
if [ x"$platform" = xefi ]; then
48
# Find the EFI System Partition.
54
54
-# Create the device map file if it is not present.
59
59
- # Create a safe temporary file.
60
60
- test -n "$mklog" && log_file=`$mklog`
62
- $grub_mkdevicemap --device-map=$device_map $no_floppy || exit 1
62
- "$grub_mkdevicemap" "--device-map=$device_map" $no_floppy || exit 1
65
65
-# Make sure that there is no duplicated entry.
66
-tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' $device_map \
66
-tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' "$device_map" \
67
67
- | sort | uniq -d | sed -n 1p`
68
68
-if test -n "$tmp"; then
69
69
- echo "The drive $tmp is defined multiple times in the device map $device_map" 1>&2
71
+ tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' $device_map \
71
+ tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' "$device_map" \
72
72
+ | sort | uniq -d | sed -n 1p`
73
73
+ if test -n "$tmp"; then
74
74
+ echo "The drive $tmp is defined multiple times in the device map $device_map" 1>&2
81
81
===================================================================
82
82
--- a/util/grub-mkconfig.in
83
83
+++ b/util/grub-mkconfig.in
88
-grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
89
grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
88
-grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed "${transform}"`
89
grub_probe=${sbindir}/`echo grub-probe | sed "${transform}"`
90
grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"