D11278.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11278.diff
View Options

	Index: head/usr.sbin/bsdinstall/scripts/config
	===================================================================
	--- head/usr.sbin/bsdinstall/scripts/config
	+++ head/usr.sbin/bsdinstall/scripts/config
	@@ -32,7 +32,7 @@
	cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf
	rm $BSDINSTALL_TMPETC/rc.conf.*

	-cat $BSDINSTALL_CHROOT/etc/sysctl.conf $BSDINSTALL_TMPETC/sysctl.conf.hardening >> $BSDINSTALL_TMPETC/sysctl.conf
	+cat $BSDINSTALL_CHROOT/etc/sysctl.conf $BSDINSTALL_TMPETC/sysctl.conf.* >> $BSDINSTALL_TMPETC/sysctl.conf
	rm $BSDINSTALL_TMPETC/sysctl.conf.*

	cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
	Index: head/usr.sbin/bsdinstall/scripts/zfsboot
	===================================================================
	--- head/usr.sbin/bsdinstall/scripts/zfsboot
	+++ head/usr.sbin/bsdinstall/scripts/zfsboot
	@@ -1446,7 +1446,7 @@
	if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then
	f_eval_catch $funcname echo "$ECHO_APPEND" \
	'vfs.zfs.min_auto_ashift=12' \
	- $BSDINSTALL_TMPBOOT/loader.conf.zfs \|\| return $FAILURE
	+ $BSDINSTALL_TMPETC/sysctl.conf.zfs \|\| return $FAILURE
	fi

	if [ "$ZFSBOOT_SWAP_MIRROR" ]; then