[src/netbsd-9]: src/distrib Pull up following revision(s) (requested by tsuts...

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

details:   https://anonhg.NetBSD.org/src/rev/f7292803b7f4
branches:  netbsd-9
changeset: 985239:f7292803b7f4
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 15 08:44:39 2021 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1335):

        distrib/sun3/miniroot/install.md: revision 1.8
        distrib/sun3/miniroot/install.md: revision 1.9
        distrib/sun2/miniroot/install.md: revision 1.8
        distrib/sun2/miniroot/install.md: revision 1.9

Don't try to add swap on miniroot.

Check if /tmp is writable to see whether the rootdev is already mounted.

Creating a dummy /tmp/root_writable file and after mountroot and
checking it on the second installation could be problematic if
users retry to installation after reboot without reinstalling miniroot.

Taken from amiga.

diffstat:

 distrib/sun2/miniroot/install.md |  6 ++----
 distrib/sun3/miniroot/install.md |  6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r 2192da7b097e -r f7292803b7f4 distrib/sun2/miniroot/install.md
--- a/distrib/sun2/miniroot/install.md  Sun Aug 15 08:41:47 2021 +0000
+++ b/distrib/sun2/miniroot/install.md  Sun Aug 15 08:44:39 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.5.2.1 2020/12/14 17:26:37 martin Exp $
+#      $NetBSD: install.md,v 1.5.2.2 2021/08/15 08:44:39 martin Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,12 +49,10 @@
 
 md_makerootwritable() {
        # Just remount the root device read-write.
-       if [ ! -e /tmp/root_writable ]; then
+       if ! cp /dev/null /tmp/.root_writable >/dev/null 2>&1; then
                echo "Remounting root read-write..."
                mi_mount_kernfs
                mount -u -t ffs /kern/rootdev /
-               swapctl -a /kern/rootdev
-               cp /dev/null /tmp/root_writable
        fi
 }
 
diff -r 2192da7b097e -r f7292803b7f4 distrib/sun3/miniroot/install.md
--- a/distrib/sun3/miniroot/install.md  Sun Aug 15 08:41:47 2021 +0000
+++ b/distrib/sun3/miniroot/install.md  Sun Aug 15 08:44:39 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.5.2.1 2020/12/14 17:26:37 martin Exp $
+#      $NetBSD: install.md,v 1.5.2.2 2021/08/15 08:44:39 martin Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,12 +49,10 @@
 
 md_makerootwritable() {
        # Just remount the root device read-write.
-       if [ ! -e /tmp/root_writable ]; then
+       if ! cp /dev/null /tmp/.root_writable >/dev/null 2>&1; then
                echo "Remounting root read-write..."
                mi_mount_kernfs
                mount -u /kern/rootdev /
-               swapctl -a /kern/rootdev
-               cp /dev/null /tmp/root_writable
        fi
 }