Changeset b01ad3f


Ignore:
Timestamp:
12/10/13 08:10:09 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
4cb8eee, 68c5dd4
Parents:
683c3e4
Message:

Backport grub fixes to 9.2

Location:
src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/00_header

    r4a9e407 rb01ad3f  
    3030. "${datarootdir}/grub/grub-mkconfig_lib" 
    3131 
     32# Set indicator that we haven't written device access yet 
     33haveDevAccess=0 
     34 
    3235# Do this as early as possible, since other commands might depend on it. 
    3336# (e.g. the `loadfont' command might need lvm or raid modules) 
     
    135138    if [ -n "$GRUB_FONT" ] ; then 
    136139       # Make the font accessible 
    137        prepare_grub_to_access_device `${grub_probe} --target=device "${GRUB_FONT}"` 
     140       if [ $haveDevAccess -ne 1 ] ; then 
     141                haveDevAccess=1 
     142                prepare_grub_to_access_device `${grub_probe} --target=device "${GRUB_FONT}"` 
     143       fi 
    138144    cat << EOF 
    139145if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then 
     
    158164EOF 
    159165                # Make the font accessible 
    160                 prepare_grub_to_access_device `${grub_probe} --target=device "${font_path}"` 
     166                if [ $haveDevAccess -ne 1 ] ; then 
     167                        haveDevAccess=1 
     168                        prepare_grub_to_access_device `${grub_probe} --target=device "${font_path}"` 
     169                fi 
    161170    cat << EOF 
    162171    font="`make_system_path_relative_to_its_root "${font_path}"`" 
     
    219228        gettext_printf "Found theme: %s\n" "$GRUB_THEME" >&2 
    220229 
    221         prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` 
     230        if [ $haveDevAccess -ne 1 ] ; then 
     231                haveDevAccess=1 
     232                prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` 
     233        fi 
    222234        cat << EOF 
    223235insmod gfxmenu 
     
    260272            *)             gettext "Unsupported image format" >&2; echo >&2; exit 1 ;; 
    261273        esac 
    262         prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` 
     274        if [ $haveDevAccess -ne 1 ] ; then 
     275                haveDevAccess=1 
     276                prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` 
     277        fi 
    263278        cat << EOF 
    264279insmod $reader 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/10_ktrueos

    r4a9e407 rb01ad3f  
    170170      cat > /tmp/.grubdataset.$$.1 << EOF 
    171171    insmod zfs 
    172     search -s -l $ztank 
     172    search --no-floppy -s -l $ztank 
    173173EOF 
    174174 
Note: See TracChangeset for help on using the changeset viewer.