diff options
| author | ae <ae@FreeBSD.org> | 2010-10-19 18:32:01 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2010-10-19 18:32:01 +0000 |
| commit | 68ea32374c7e646c08280187e9b79478f2d884a5 (patch) | |
| tree | f79f632019baac393c3efb7e5de1c8ebd77f2cc1 /sys/kern/vfs_mountroot.c | |
| parent | 8d47fc426a5c64e42dc4c51bf035d6fb4eabc4fe (diff) | |
| download | FreeBSD-src-68ea32374c7e646c08280187e9b79478f2d884a5.zip FreeBSD-src-68ea32374c7e646c08280187e9b79478f2d884a5.tar.gz | |
ZFS pool name is not a real device in devfs. Do not wait for
device appear when mounting root from ZFS.
Reviewed by: marcel
Approved by: mav (mentor)
Diffstat (limited to 'sys/kern/vfs_mountroot.c')
| -rw-r--r-- | sys/kern/vfs_mountroot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c index ac4927e..07c2988 100644 --- a/sys/kern/vfs_mountroot.c +++ b/sys/kern/vfs_mountroot.c @@ -713,7 +713,8 @@ parse_mount(char **conf) goto out; } - if (dev[0] != '\0' && !parse_mount_dev_present(dev)) { + if (strcmp(fs, "zfs") != 0 && dev[0] != '\0' && + !parse_mount_dev_present(dev)) { printf("mountroot: waiting for device %s ...\n", dev); delay = hz / 10; timeout = root_mount_timeout * hz; |
