Module Name: src
Committed By: tsutsui
Date: Sat Nov 25 09:40:17 UTC 2017
Modified Files:
src/distrib/atari/floppies/common: dot.profile mtree.conf
src/distrib/atari/floppies/install: list
Log Message:
Use kernfs to detect root file system device, instead of fat sysctl(8).
Should fix sysinst.fs overflow that prevents daily build.
Discussed on port-atari@:
http://mail-index.netbsd.org/port-atari/2017/11/thread1.html#000558
and whole installation is briefly tested on TT030.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/atari/floppies/common/dot.profile
cvs rdiff -u -r1.2 -r1.3 src/distrib/atari/floppies/common/mtree.conf
cvs rdiff -u -r1.21 -r1.22 src/distrib/atari/floppies/install/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/atari/floppies/common/dot.profile
diff -u src/distrib/atari/floppies/common/dot.profile:1.6 src/distrib/atari/floppies/common/dot.profile:1.7
--- src/distrib/atari/floppies/common/dot.profile:1.6 Wed Nov 15 16:19:19 2017
+++ src/distrib/atari/floppies/common/dot.profile Sat Nov 25 09:40:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.6 2017/11/15 16:19:19 tsutsui Exp $
+# $NetBSD: dot.profile,v 1.7 2017/11/25 09:40:17 tsutsui Exp $
#
# Copyright (c) 1995 Jason R. Thorpe
# Copyright (c) 1994 Christopher G. Demetriou
@@ -49,8 +49,7 @@ umask 022
mount_gemdos() mount_msdos -G "$@"
makerootwritable() {
- # note, only handles up to partition 'j'
- rootdev=/dev/$(sysctl -n kern.root_device)$(sysctl -n kern.root_partition | sed y/0123456789/abcdefghij/)
+ rootdev=/kern/rootdev
if ! mount -u $rootdev / ; then
echo "Unable to mount $rootdev read-write"
exit 1
@@ -66,6 +65,9 @@ if [ "X${DONEPROFILE}" = "X" ]; then
echo 'erase ^H, werase ^W, kill ^U, intr ^C'
stty newcrt werase ^W intr ^C kill ^U erase ^H 9600
+ # mount the kernfs so that we can check rootdev etc.
+ mount -t kernfs /kern /kern
+
# mount root read write
makerootwritable
Index: src/distrib/atari/floppies/common/mtree.conf
diff -u src/distrib/atari/floppies/common/mtree.conf:1.2 src/distrib/atari/floppies/common/mtree.conf:1.3
--- src/distrib/atari/floppies/common/mtree.conf:1.2 Sat Jan 30 05:15:18 2016
+++ src/distrib/atari/floppies/common/mtree.conf Sat Nov 25 09:40:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mtree.conf,v 1.2 2016/01/30 05:15:18 tsutsui Exp $
+# $NetBSD: mtree.conf,v 1.3 2017/11/25 09:40:17 tsutsui Exp $
/set type=dir uname=root gname=wheel mode=0755
@@ -6,6 +6,7 @@
./bin
./dev
./etc
+./kern
./mnt
./mnt2
./sbin
Index: src/distrib/atari/floppies/install/list
diff -u src/distrib/atari/floppies/install/list:1.21 src/distrib/atari/floppies/install/list:1.22
--- src/distrib/atari/floppies/install/list:1.21 Wed Nov 15 16:37:00 2017
+++ src/distrib/atari/floppies/install/list Sat Nov 25 09:40:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.21 2017/11/15 16:37:00 tsutsui Exp $
+# $NetBSD: list,v 1.22 2017/11/25 09:40:17 tsutsui Exp $
PROG bin/cat
PROG bin/chmod
@@ -25,13 +25,14 @@ PROG sbin/mknod
PROG sbin/mount
PROG sbin/mount_cd9660
PROG sbin/mount_ffs
+PROG sbin/mount_kernfs
PROG sbin/mount_msdos
PROG sbin/mount_nfs
PROG sbin/newfs sbin/mount_mfs
PROG sbin/ping
PROG sbin/reboot sbin/halt
PROG sbin/route
-PROG sbin/sysctl
+#PROG sbin/sysctl
PROG sbin/umount
PROG usr/bin/ftp
