D40086.1783183434.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40086.1783183434.diff
View Options

	diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8
	--- a/usr.sbin/bsdinstall/bsdinstall.8
	+++ b/usr.sbin/bsdinstall/bsdinstall.8
	@@ -125,9 +125,9 @@
	Creates a single
	.Ic zpool
	with separate datasets for
	+.Pa /home ,
	.Pa /tmp ,
	.Pa /usr ,
	-.Pa /usr/home ,
	.Pa /usr/ports ,
	.Pa /usr/src ,
	and
	@@ -598,15 +598,15 @@
	/$ZFSBOOT_BEROOT_NAME mountpoint=none
	/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME mountpoint=/

	+# Home directories separated so they are common to all BEs
	+/home mountpoint=/home
	+
	# Compress /tmp, allow exec but not setuid
	/tmp mountpoint=/tmp,exec=on,setuid=off

	# Do not mount /usr so that 'base' files go to the BEROOT
	/usr mountpoint=/usr,canmount=off

	-# Home directories separated so they are common to all BEs
	-/usr/home # NB: /home is a symlink to /usr/home
	-
	# Ports tree
	/usr/ports setuid=off

	diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
	--- a/usr.sbin/bsdinstall/scripts/zfsboot
	+++ b/usr.sbin/bsdinstall/scripts/zfsboot
	@@ -150,15 +150,15 @@
	/$ZFSBOOT_BEROOT_NAME mountpoint=none
	/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME mountpoint=/

	+ # Home directories separated so they are common to all BEs
	+ /home mountpoint=/home
	+
	# Compress /tmp, allow exec but not setuid
	/tmp mountpoint=/tmp,exec=on,setuid=off

	# Don't mount /usr so that 'base' files go to the BEROOT
	/usr mountpoint=/usr,canmount=off

	- # Home directories separated so they are common to all BEs
	- /usr/home # NB: /home is a symlink to /usr/home
	-
	# Ports tree
	/usr/ports setuid=off