+- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
++ for dir in . /usr/local/share/fonts/gnu-unifont /usr/local/share/fonts/gnu-unifont-ttf; do
- print_option_help "--recheck" "$(gettext "delete device map if it already exists")"
- print_option_help "--force" "$(gettext "install even if problems are detected")"
- print_option_help "--force-file-id" "$(gettext "use identifier file even if UUID is available")"
-+ print_option_help "--force-label" "$(gettext "use filesystem label even if UUID is available")"
-+
- print_option_help "--disk-module=$(gettext "MODULE")" "$(gettext "disk module to use (biosdisk or native). This option is only available on BIOS target.")"
- print_option_help "--no-nvram" "$(gettext "don't update the \`boot-device' NVRAM variable. This option is only available on IEEE1275 targets.")"
- print_option_help "--removable" "$(gettext "the installation device is removable. This option is only available on EFI.")"
-@@ -159,6 +161,9 @@ do
- --force-file-id)
- force_file_id=y ;;
-
-+ --force-label)
-+ force_fs_label=y ;;
-+
- # Accept and ignore for compatibility
- --font)
- shift;;
-@@ -585,7 +590,7 @@ fi
- partmap_module=
- for x in `echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=partmap --device 2> /dev/null`; do
- case "$x" in
-- netbsd | openbsd)
-+ netbsd | openbsd | freebsd )
- partmap_module="$partmap_module part_bsd";;
- "") ;;
- *)
-@@ -593,6 +598,11 @@ for x in `echo "${grub_device}" | xargs