Commit 875e0a88 authored by Mike Hibler's avatar Mike Hibler

"Final" tweaks based on actual usage.

parent caa38dd1
...@@ -512,7 +512,7 @@ fixone() { ...@@ -512,7 +512,7 @@ fixone() {
export SLICEFIX_CONSOLE=`getvar CONSOLE "$iline" unknown` export SLICEFIX_CONSOLE=`getvar CONSOLE "$iline" unknown`
export SLICEFIX_BIOSDISK=`getvar BIOSDISK "$iline"` export SLICEFIX_BIOSDISK=`getvar BIOSDISK "$iline"`
export SLICEFIX_DOM0MEM=`getvar DOM0MEM "$iline" unknown` export SLICEFIX_DOM0MEM=`getvar DOM0MEM "$iline" unknown`
export SLICEFIX_DISABLEIF=`getvar DISABLEIF "$iline" unknown` export SLICEFIX_DISABLEIF=`getvar DISABLEIF "$iline"`
# #
# XXX stop complaining about potential UFS1 problems # XXX stop complaining about potential UFS1 problems
......
...@@ -457,7 +457,7 @@ fixone() { ...@@ -457,7 +457,7 @@ fixone() {
export SLICEFIX_CONSOLE=`getvar CONSOLE "$iline" unknown` export SLICEFIX_CONSOLE=`getvar CONSOLE "$iline" unknown`
export SLICEFIX_BIOSDISK=`getvar BIOSDISK "$iline"` export SLICEFIX_BIOSDISK=`getvar BIOSDISK "$iline"`
export SLICEFIX_DOM0MEM=`getvar DOM0MEM "$iline" unknown` export SLICEFIX_DOM0MEM=`getvar DOM0MEM "$iline" unknown`
export SLICEFIX_DISABLEIF=`getvar DISABLEIF "$iline" unknown` export SLICEFIX_DISABLEIF=`getvar DISABLEIF "$iline"`
$BINDIR/slicefix $PART $DISK $BINDIR/slicefix $PART $DISK
return $? return $?
...@@ -620,6 +620,9 @@ esac ...@@ -620,6 +620,9 @@ esac
FIRSTMBR='' FIRSTMBR=''
devs="" devs=""
while read line; do while read line; do
echo "Loading image"
echo " LOADINFO=\"$line\""
# #
# Remember the info for this partition line so we can run slicefix later. # Remember the info for this partition line so we can run slicefix later.
# Yes, we can load the same partition multiple times due to our delta # Yes, we can load the same partition multiple times due to our delta
......
...@@ -144,7 +144,7 @@ fi ...@@ -144,7 +144,7 @@ fi
DISABLEIF=$SLICEFIX_DISABLEIF DISABLEIF=$SLICEFIX_DISABLEIF
DISABLEHINT= DISABLEHINT=
if [ -n "$DISABLEIF" ]; then if [ -n "$DISABLEIF" ]; then
_str=`echo $DISABLEIF | sed -E -e 's/^([a-zA-Z0-9]*[a-zA-Z])([0-9]+)/hint.\1.\2.disabled/'` _str=`echo $DISABLEIF | sed -e 's/^([a-zA-Z0-9]*[a-zA-Z])([0-9][0-9]*)/hint.\1.\2.disabled/'`
if [ "$_str" = "$DISABLEIF" ]; then if [ "$_str" = "$DISABLEIF" ]; then
echo "WARNING: unparsable define name \"$DISABLEIF\" ignored" echo "WARNING: unparsable define name \"$DISABLEIF\" ignored"
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment