Module Name: src
Committed By: roy
Date: Sun Feb 23 10:51:12 UTC 2020
Modified Files:
src/distrib/common: mtree.zfsroot zfsroot.rc
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/common/mtree.zfsroot \
src/distrib/common/zfsroot.rc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/mtree.zfsroot
diff -u src/distrib/common/mtree.zfsroot:1.2 src/distrib/common/mtree.zfsroot:1.3
--- src/distrib/common/mtree.zfsroot:1.2 Sun Feb 23 05:15:54 2020
+++ src/distrib/common/mtree.zfsroot Sun Feb 23 10:51:12 2020
@@ -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
Index: src/distrib/common/zfsroot.rc
diff -u src/distrib/common/zfsroot.rc:1.2 src/distrib/common/zfsroot.rc:1.3
--- src/distrib/common/zfsroot.rc:1.2 Sun Feb 23 05:15:54 2020
+++ src/distrib/common/zfsroot.rc Sun Feb 23 10:51:12 2020
@@ -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 "Importing $rpool"
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
