diff options
| author | allanjude <allanjude@FreeBSD.org> | 2016-02-07 00:49:15 +0000 |
|---|---|---|
| committer | allanjude <allanjude@FreeBSD.org> | 2016-02-07 00:49:15 +0000 |
| commit | 66ca079836f33725c8ee76ed154ed176e165a5bc (patch) | |
| tree | 7f3cabe46714fd9b8eef4c8be5209863e1b11046 | |
| parent | 993c2695aa5e66d4379e155446baeeb4d6c9c8c0 (diff) | |
| download | FreeBSD-src-66ca079836f33725c8ee76ed154ed176e165a5bc.zip FreeBSD-src-66ca079836f33725c8ee76ed154ed176e165a5bc.tar.gz | |
Do not set vfs.root.mountfrom unnecessarily
This causes boot from external media (installer USB image) to mount / from
the default ZFS BE, rather than the USB device.
Reported by: kmoore
MFC after: 5 days
Sponsored by: ScaleEngine Inc.
| -rw-r--r-- | sys/boot/zfs/zfs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/boot/zfs/zfs.c b/sys/boot/zfs/zfs.c index 8e6d420..bf2fc6f8 100644 --- a/sys/boot/zfs/zfs.c +++ b/sys/boot/zfs/zfs.c @@ -722,8 +722,6 @@ init_zfs_bootenv(char *currdev) currdev[strlen(currdev) - 1] = '\0'; setenv("zfs_be_active", currdev, 1); setenv("zfs_be_currpage", "1", 1); - /* Do not overwrite if already set */ - setenv("vfs.root.mountfrom", currdev, 0); /* Forward past zfs: */ currdev = strchr(currdev, ':'); currdev++; |
