Lines 107-112
Link Here
|
107 |
print_option_help "--recheck" "$(gettext "delete device map if it already exists")" |
107 |
print_option_help "--recheck" "$(gettext "delete device map if it already exists")" |
108 |
print_option_help "--force" "$(gettext "install even if problems are detected")" |
108 |
print_option_help "--force" "$(gettext "install even if problems are detected")" |
109 |
print_option_help "--force-file-id" "$(gettext "use identifier file even if UUID is available")" |
109 |
print_option_help "--force-file-id" "$(gettext "use identifier file even if UUID is available")" |
|
|
110 |
print_option_help "--force-label" "$(gettext "use filesystem label even if UUID is available")" |
111 |
|
110 |
print_option_help "--disk-module=$(gettext "MODULE")" "$(gettext "disk module to use (biosdisk or native). This option is only available on BIOS target.")" |
112 |
print_option_help "--disk-module=$(gettext "MODULE")" "$(gettext "disk module to use (biosdisk or native). This option is only available on BIOS target.")" |
111 |
print_option_help "--no-nvram" "$(gettext "don't update the \`boot-device' NVRAM variable. This option is only available on IEEE1275 targets.")" |
113 |
print_option_help "--no-nvram" "$(gettext "don't update the \`boot-device' NVRAM variable. This option is only available on IEEE1275 targets.")" |
112 |
print_option_help "--removable" "$(gettext "the installation device is removable. This option is only available on EFI.")" |
114 |
print_option_help "--removable" "$(gettext "the installation device is removable. This option is only available on EFI.")" |
Lines 159-164
Link Here
|
159 |
--force-file-id) |
161 |
--force-file-id) |
160 |
force_file_id=y ;; |
162 |
force_file_id=y ;; |
161 |
|
163 |
|
|
|
164 |
--force-label) |
165 |
force_fs_label=y ;; |
166 |
|
162 |
# Accept and ignore for compatibility |
167 |
# Accept and ignore for compatibility |
163 |
--font) |
168 |
--font) |
164 |
shift;; |
169 |
shift;; |
Lines 585-591
Link Here
|
585 |
partmap_module= |
590 |
partmap_module= |
586 |
for x in `echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=partmap --device 2> /dev/null`; do |
591 |
for x in `echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=partmap --device 2> /dev/null`; do |
587 |
case "$x" in |
592 |
case "$x" in |
588 |
netbsd | openbsd) |
593 |
netbsd | openbsd | freebsd ) |
589 |
partmap_module="$partmap_module part_bsd";; |
594 |
partmap_module="$partmap_module part_bsd";; |
590 |
"") ;; |
595 |
"") ;; |
591 |
*) |
596 |
*) |
Lines 593-598
Link Here
|
593 |
esac |
598 |
esac |
594 |
done |
599 |
done |
595 |
|
600 |
|
|
|
601 |
case `uname -o` in |
602 |
FreeBSD) |
603 |
partmap_module="$partmap_module part_msdos part_bsd";; |
604 |
esac |
605 |
|
596 |
# Device abstraction module, if any (lvm, raid). |
606 |
# Device abstraction module, if any (lvm, raid). |
597 |
devabstraction_module="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=abstraction --device`" |
607 |
devabstraction_module="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=abstraction --device`" |
598 |
|
608 |
|
Lines 668-683
Link Here
|
668 |
echo 1>&2 |
678 |
echo 1>&2 |
669 |
hints= |
679 |
hints= |
670 |
fi |
680 |
fi |
|
|
681 |
|
682 |
if [ x"$force_fs_label" = xy ]; then |
683 |
fs_label="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=fs_label --device`" |
684 |
fi |
685 |
|
686 |
if [ x"$fs_label" != x ]; then |
687 |
echo "search.fs_label ${fs_label} root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg" |
688 |
search_module=search_label |
689 |
else |
690 |
|
671 |
if [ x"$uuid" != x ]; then |
691 |
if [ x"$uuid" != x ]; then |
672 |
echo "search.fs_uuid ${uuid} root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg" |
692 |
echo "search.fs_uuid ${uuid} root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg" |
673 |
search_module=search_fs_uuid |
693 |
search_module=search_fs_uuid |
674 |
else |
694 |
else |
675 |
mkdir -p "${grubdir}/uuid" |
695 |
mkdir -p "${grubdir}/uuid" |
676 |
file="`mktemp "${grubdir}/uuid/XXXXXXXXXXXXXXXXXXXXXXXXX"`" |
696 |
file="`mktemp "${grubdir}/uuid/XXXX-XXXX-XXXX"`" |
677 |
relfile="`${grub_mkrelpath} "$file"`" |
697 |
relfile="`${grub_mkrelpath} "$file"`" |
678 |
echo "search.file '${relfile}' root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg" |
698 |
echo "search.file '${relfile}' root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg" |
679 |
search_module=search_fs_file |
699 |
search_module=search_fs_file |
680 |
fi |
700 |
fi |
|
|
701 |
fi |
702 |
|
681 |
echo 'set prefix=($root)'"$(echo "${relative_grubdir}" | sed "s,\\([ \"'\\\\]\\),\\\\\\1,g")" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg" |
703 |
echo 'set prefix=($root)'"$(echo "${relative_grubdir}" | sed "s,\\([ \"'\\\\]\\),\\\\\\1,g")" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg" |
682 |
config_opt_file="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg" |
704 |
config_opt_file="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg" |
683 |
modules="$modules $search_module" |
705 |
modules="$modules $search_module" |