Module Name: src
Committed By: martin
Date: Sun Aug 15 08:44:39 UTC 2021
Modified Files:
src/distrib/sun2/miniroot [netbsd-9]: install.md
src/distrib/sun3/miniroot [netbsd-9]: install.md
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/distrib/sun2/miniroot/install.md
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/distrib/sun3/miniroot/install.md
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sun2/miniroot/install.md
diff -u src/distrib/sun2/miniroot/install.md:1.5.2.1 src/distrib/sun2/miniroot/install.md:1.5.2.2
--- src/distrib/sun2/miniroot/install.md:1.5.2.1 Mon Dec 14 17:26:37 2020
+++ src/distrib/sun2/miniroot/install.md Sun Aug 15 08:44:39 2021
@@ -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_set_term() {
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
}
Index: src/distrib/sun3/miniroot/install.md
diff -u src/distrib/sun3/miniroot/install.md:1.5.2.1 src/distrib/sun3/miniroot/install.md:1.5.2.2
--- src/distrib/sun3/miniroot/install.md:1.5.2.1 Mon Dec 14 17:26:37 2020
+++ src/distrib/sun3/miniroot/install.md Sun Aug 15 08:44:39 2021
@@ -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_set_term() {
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
}
