Date: Sat, 9 Jun 2018 17:47:56 +0000 (UTC) From: Allan Jude <allanjude@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334887 - head/tools/boot Message-ID: <201806091747.w59Hluda015700@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: allanjude Date: Sat Jun 9 17:47:56 2018 New Revision: 334887 URL: https://svnweb.freebsd.org/changeset/base/334887 Log: Change rootgen.sh to use the default ZFS boot environment name Reviewed by: imp (maintainer) Sponsored by: Klara Systems Differential Revision: https://reviews.freebsd.org/D15699 Modified: head/tools/boot/rootgen.sh Modified: head/tools/boot/rootgen.sh ============================================================================== --- head/tools/boot/rootgen.sh Sat Jun 9 17:40:31 2018 (r334886) +++ head/tools/boot/rootgen.sh Sat Jun 9 17:47:56 2018 (r334887) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806091747.w59Hluda015700>