Changeset 4a9e407


Ignore:
Timestamp:
10/28/13 10:27:35 (9 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
ba396a8, ddb13b37
Parents:
8b3a780
Message:

Update GRUB generation, read in device.hints directly now, also display
a message to hold "Left-Shift" to get into the boot-menu.

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

    r0d0ffdb r4a9e407  
    277277        fi 
    278278        cat << EOF 
     279echo "Hold Left-Shift for menu.." 
    279280if sleep$verbose --interruptible ${1} ; then 
    280281  if keystatus --shift; then 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/10_ktrueos

    rca660df r4a9e407  
    5353 
    5454  # Loader files, in order of which to read them 
    55   lFiles="${fMnt}/boot/device.hints ${fMnt}/boot/loader.conf.local ${fMnt}/boot/loader.conf ${fMnt}/boot/loader.conf.trueos ${fMnt}/boot/loader.conf.pcbsd" 
     55  lFiles="${fMnt}/boot/loader.conf.local ${fMnt}/boot/loader.conf ${fMnt}/boot/loader.conf.trueos ${fMnt}/boot/loader.conf.pcbsd" 
    5656  for f in $lFiles 
    5757  do 
     
    203203  cat /tmp/.grubdataset.$$.1 
    204204  echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel" 
     205  echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints" 
    205206  cat /tmp/.grubdataset.$$.2 
    206207 
     
    218219  cat /tmp/.grubdataset.$$.1 
    219220  echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel -s" 
     221  echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints" 
    220222  cat /tmp/.grubdataset.$$.2 
    221223 
     
    233235  cat /tmp/.grubdataset.$$.1 
    234236  echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel -v" 
     237  echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints" 
    235238  cat /tmp/.grubdataset.$$.2 
    236239 
     
    249252    cat /tmp/.grubdataset.$$.1 
    250253    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel" 
     254    echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints" 
    251255    cat /tmp/.grubdataset.$$.2 
    252256 
     
    264268    cat /tmp/.grubdataset.$$.1 
    265269    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel" 
     270    echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints" 
    266271    cat /tmp/.grubdataset.$$.2 
    267272 
Note: See TracChangeset for help on using the changeset viewer.