[src/trunk]: src/distrib/common ramdisk-zfsroot: We no longer need to have /e...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/137258972166
branches:  trunk
changeset: 969576:137258972166
user:      roy <roy%NetBSD.org@localhost>
date:      Sun Feb 23 10:51:12 2020 +0000

description:
ramdisk-zfsroot: We no longer need to have /etc/zfs in mtree

Now that mountall doesn't rely on /etc/zfs/zpool.cache being present.

diffstat:

 distrib/common/mtree.zfsroot |  4 +---
 distrib/common/zfsroot.rc    |  7 +------
 2 files changed, 2 insertions(+), 9 deletions(-)

diffs (34 lines):

diff -r 547c742df21e -r 137258972166 distrib/common/mtree.zfsroot
--- a/distrib/common/mtree.zfsroot      Sun Feb 23 10:30:43 2020 +0000
+++ b/distrib/common/mtree.zfsroot      Sun Feb 23 10:51:12 2020 +0000
@@ -1,7 +1,5 @@
-#      $NetBSD: mtree.zfsroot,v 1.2 2020/02/23 05:15:54 roy Exp $
+#      $NetBSD: mtree.zfsroot,v 1.3 2020/02/23 10:51:12 roy Exp $
 
 .
 ./altroot
-./etc
-./etc/zfs
 ./rpool
diff -r 547c742df21e -r 137258972166 distrib/common/zfsroot.rc
--- a/distrib/common/zfsroot.rc Sun Feb 23 10:30:43 2020 +0000
+++ b/distrib/common/zfsroot.rc Sun Feb 23 10:51:12 2020 +0000
@@ -1,6 +1,6 @@
 #/bin/sh
 #
-#      $NetBSD: zfsroot.rc,v 1.2 2020/02/23 05:15:54 roy Exp $
+#      $NetBSD: zfsroot.rc,v 1.3 2020/02/23 10:51:12 roy Exp $
 
 echo "Starting root on ZFS boot strapper"
 
@@ -46,10 +46,5 @@
 echo "Mounting $rpool/$rroot to /altroot"
 /sbin/mount -t zfs "$rpool/$rroot" /altroot;
 
-# This ensures that rc.d/mountall mounts all ZFS mounts set to automount.
-if [ ! -e /altroot/etc/zfs/zpool.cache ]; then
-       echo >/altroot/etc/zfs/zpool.cache
-fi
-
 echo "Pivoting to /altroot, welcome to root on ZFS"
 /sbin/sysctl -w init.root=/altroot