aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Jude <allanjude@FreeBSD.org>2018-06-09 17:47:56 +0000
committerAllan Jude <allanjude@FreeBSD.org>2018-06-09 17:47:56 +0000
commit2145d0ec65caacf5bafa1dd0277c76bff9969416 (patch)
tree05fb81e0999997550e6dd215af886b3f1ac56845
parenta805648634bfafbd60bc5bad9b08fe687264d4ec (diff)
Notes
-rwxr-xr-xtools/boot/rootgen.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh
index 98e726f6a3704..455d9dfe5313d 100755
--- a/tools/boot/rootgen.sh
+++ b/tools/boot/rootgen.sh
@@ -96,7 +96,7 @@ mk_nogeli_gpt_zfs_legacy() {
# install-boot will make this bootable
zpool create -O mountpoint=none -R ${mntpt} ${pool} ${md}p2
zpool set bootfs=${pool} ${pool}
- zfs create -o mountpoint=/ ${pool}/ROOT
+ zfs create -po mountpoint=/ ${pool}/ROOT/default
# NB: The online guides go nuts customizing /var and other mountpoints here, no need
cpsys ${src} ${mntpt}
df
@@ -109,9 +109,9 @@ EOF
cp /boot/kernel/opensolaris.ko ${mntpt}/boot/kernel/opensolaris.ko
ls -las ${mntpt}/boot
# end tweaks
- zfs umount -f ${pool}/ROOT
- zfs set mountpoint=none ${pool}/ROOT
- zpool set bootfs=${pool}/ROOT ${pool}
+ zfs umount -f ${pool}/ROOT/default
+ zfs set mountpoint=none ${pool}/ROOT/default
+ zpool set bootfs=${pool}/ROOT/default ${pool}
zpool set autoexpand=on ${pool}
zpool export ${pool}
${SRCTOP}/tools/boot/install-boot.sh -g ${geli} -s ${scheme} -f ${fs} -b ${bios} -d ${src} ${md}