Permalink
Browse files

Update GRUB generation, read in device.hints directly now, also display

a message to hold "Left-Shift" to get into the boot-menu.
  • Loading branch information...
1 parent 8b3a780 commit 4a9e4070191ff67331ea78e7fb4aa6f8a9bdf636 @kmoore134 kmoore134 committed Oct 28, 2013
@@ -276,6 +276,7 @@ make_timeout ()
verbose=" --verbose"
fi
cat << EOF
+echo "Hold Left-Shift for menu.."
if sleep$verbose --interruptible ${1} ; then
if keystatus --shift; then
set timeout=-1
@@ -52,7 +52,7 @@ display_loaderopts()
touch /tmp/.lSysCtls.$$
# Loader files, in order of which to read them
- lFiles="${fMnt}/boot/device.hints ${fMnt}/boot/loader.conf.local ${fMnt}/boot/loader.conf ${fMnt}/boot/loader.conf.trueos ${fMnt}/boot/loader.conf.pcbsd"
+ lFiles="${fMnt}/boot/loader.conf.local ${fMnt}/boot/loader.conf ${fMnt}/boot/loader.conf.trueos ${fMnt}/boot/loader.conf.pcbsd"
for f in $lFiles
do
if [ ! -e "$f" ] ; then continue ; fi
@@ -202,6 +202,7 @@ EOF
# Get the dataset guts
cat /tmp/.grubdataset.$$.1
echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel"
+ echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
cat /tmp/.grubdataset.$$.2
# Set any options
@@ -217,6 +218,7 @@ EOF
# Get the dataset guts
cat /tmp/.grubdataset.$$.1
echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel -s"
+ echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
cat /tmp/.grubdataset.$$.2
# Set any options
@@ -232,6 +234,7 @@ EOF
# Get the dataset guts
cat /tmp/.grubdataset.$$.1
echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel -v"
+ echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
cat /tmp/.grubdataset.$$.2
# Set any options
@@ -248,6 +251,7 @@ EOF
# Get the dataset guts
cat /tmp/.grubdataset.$$.1
echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel"
+ echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
cat /tmp/.grubdataset.$$.2
# Set any options
@@ -263,6 +267,7 @@ EOF
# Get the dataset guts
cat /tmp/.grubdataset.$$.1
echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel"
+ echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
cat /tmp/.grubdataset.$$.2
# Set any options

0 comments on commit 4a9e407

Please sign in to comment.