|
|
@ -2017,16 +2017,16 @@ rootdev_init() {
|
|
|
|
done
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ "${got_good_root}" = "1" ] && is_livecd && ! is_nfs
|
|
|
|
if [ "${got_good_root}" = "1" ] && is_livecd && ! is_nfs; then
|
|
|
|
then
|
|
|
|
|
|
|
|
# CD already mounted; no further checks necessary
|
|
|
|
# CD already mounted; no further checks necessary
|
|
|
|
break
|
|
|
|
break
|
|
|
|
elif [ "${LOOPTYPE}" = "sgimips" ]
|
|
|
|
fi
|
|
|
|
then
|
|
|
|
if [ "${LOOPTYPE}" = "sgimips" ]; then
|
|
|
|
# sgimips mounts the livecd root partition directly
|
|
|
|
# sgimips mounts the livecd root partition directly
|
|
|
|
# there is no isofs filesystem to worry about
|
|
|
|
# there is no isofs filesystem to worry about
|
|
|
|
break
|
|
|
|
break
|
|
|
|
else
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
good_msg "Mounting $REAL_ROOT as root..."
|
|
|
|
good_msg "Mounting $REAL_ROOT as root..."
|
|
|
|
|
|
|
|
|
|
|
|
if [ "${ROOTFSTYPE}" = 'zfs' ]
|
|
|
|
if [ "${ROOTFSTYPE}" = 'zfs' ]
|
|
|
@ -2090,7 +2090,6 @@ rootdev_init() {
|
|
|
|
got_good_root=0
|
|
|
|
got_good_root=0
|
|
|
|
REAL_ROOT=''
|
|
|
|
REAL_ROOT=''
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
done
|
|
|
|
done
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|