Permit both mountpoint=legacy and mountpoint=/ in initrd
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
parent
8610b52bd4
commit
6583dcacdc
@ -6,5 +6,11 @@ if [ "$rootfs" = "zfs" ]; then
|
|||||||
zfsrootfs=`echo "$root" | sed 's|^zfs:||'`
|
zfsrootfs=`echo "$root" | sed 's|^zfs:||'`
|
||||||
zfspool=`echo "$zfsrootfs" | sed 's|/.*||g'`
|
zfspool=`echo "$zfsrootfs" | sed 's|/.*||g'`
|
||||||
zpool import -N "$zfspool"
|
zpool import -N "$zfspool"
|
||||||
mount -o zfsutil -t "$rootfs" "$zfsrootfs" "$NEWROOT" && ROOTFS_MOUNTED=yes
|
mount -o zfsutil -t "$rootfs" "$zfsrootfs" "$NEWROOT"
|
||||||
|
if [ "$?" = "0" ]
|
||||||
|
then
|
||||||
|
ROOTFS_MOUNTED=yes
|
||||||
|
else
|
||||||
|
mount -t "$rootfs" "$zfsrootfs" "$NEWROOT" && ROOTFS_MOUNTED=yes
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user