diff options
| author | pjd <pjd@FreeBSD.org> | 2004-09-23 10:13:18 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2004-09-23 10:13:18 +0000 |
| commit | 99b0ffd3c0991c325d4dfcc78af450e65f31b53e (patch) | |
| tree | b6e24d5e3d76cd840e06a759f7d87adadcda0e7a /sys/ufs | |
| parent | 49324bfed438d33dd53f2cce94f2f94f8eeecd78 (diff) | |
| download | FreeBSD-src-99b0ffd3c0991c325d4dfcc78af450e65f31b53e.zip FreeBSD-src-99b0ffd3c0991c325d4dfcc78af450e65f31b53e.tar.gz | |
Introduce new /boot/loader.conf variable: root_mount_delay.
It can be used to delay mounting root partition to give a chance to GEOM
providers to show up.
Now, when there is no needed provider, vfs_rootmount() function will look
for it every second and if it can't be find in defined time, it'll ask
for root device name (before this change it was done immediately).
This will allow to boot from gmirror device in degraded mode.
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 8fc3741..a8a5937 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -161,11 +161,8 @@ ffs_omount(struct mount *mp, char *path, caddr_t data, struct thread *td) * Use NULL path to indicate we are mounting the root filesystem. */ if (path == NULL) { - if ((error = bdevvp(rootdev, &rootvp))) { - printf("ffs_mountroot: can't find rootvp\n"); + if ((error = bdevvp(rootdev, &rootvp)) != 0) return (error); - } - if ((error = ffs_mountfs(rootvp, mp, td)) != 0) return (error); return (0); |
