git://git.camperquake.de
/
zfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8610b52
)
Permit both mountpoint=legacy and mountpoint=/ in initrd
author
Manuel Amador (Rudd-O)
<rudd-o@rudd-o.com>
Wed, 6 Apr 2011 16:52:58 +0000
(09:52 -0700)
committer
Brian Behlendorf
<behlendorf1@llnl.gov>
Thu, 7 Apr 2011 17:31:02 +0000
(10:31 -0700)
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
dracut/90zfs/mount-zfs.sh
patch
|
blob
|
history
diff --git
a/dracut/90zfs/mount-zfs.sh
b/dracut/90zfs/mount-zfs.sh
index
6b742e3
..
9c753d9
100755
(executable)
--- a/
dracut/90zfs/mount-zfs.sh
+++ b/
dracut/90zfs/mount-zfs.sh
@@
-6,5
+6,11
@@
if [ "$rootfs" = "zfs" ]; then
zfsrootfs=`echo "$root" | sed 's|^zfs:||'`
zfspool=`echo "$zfsrootfs" | sed 's|/.*||g'`
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