summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386/zfsboot
diff options
context:
space:
mode:
authorrnoland <rnoland@FreeBSD.org>2009-11-23 16:00:16 +0000
committerrnoland <rnoland@FreeBSD.org>2009-11-23 16:00:16 +0000
commit396246bb32eb9a9a68bbe890fc9487b2da481295 (patch)
tree1b33b3845169c1e266700990c19faedb2cb8a328 /sys/boot/i386/zfsboot
parent907e9240f27eb700a2ec22013031266eddcb0cd5 (diff)
downloadFreeBSD-src-396246bb32eb9a9a68bbe890fc9487b2da481295.zip
FreeBSD-src-396246bb32eb9a9a68bbe890fc9487b2da481295.tar.gz
Create a seperate ZFS enabled loader.
This adds zfsloader which will be called by zfsboot/gptzfsboot code rather than the tradional loader. This eliminates the need to set the LOADER_ZFS_SUPPORT variable in order to get a ZFS enabled loader. Note however, that you must reinstall your bootcode (zfsboot/gptzfsboot) in order for the boot process to use the new loader. New installations will no longer be required to build a ZFS enabled loader for a working ZFS boot system. Installing zfsboot/gptzfsboot is sufficient for acknowledging the use of CDDL code and therefore the ZFS enabled loader. Based on a previous patch from jhb@ Reviewed by: jhb@ MFC after: 2 weeks
Diffstat (limited to 'sys/boot/i386/zfsboot')
-rw-r--r--sys/boot/i386/zfsboot/zfsboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c
index 690d803..ca2c90e 100644
--- a/sys/boot/i386/zfsboot/zfsboot.c
+++ b/sys/boot/i386/zfsboot/zfsboot.c
@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$");
#define KARGS_FLAGS_ZFS 0x4
#define PATH_CONFIG "/boot.config"
-#define PATH_BOOT3 "/boot/loader"
+#define PATH_BOOT3 "/boot/zfsloader"
#define PATH_KERNEL "/boot/kernel/kernel"
#define ARGS 0x900
OpenPOWER on IntegriCloud