Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/utils/embedded/conf Disable kernfs on live images --...
details: https://anonhg.NetBSD.org/src/rev/47d34b744449
branches: trunk
changeset: 984409:47d34b744449
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Tue Jul 06 11:49:36 2021 +0000
description:
Disable kernfs on live images -- it is not required.
diffstat:
distrib/utils/embedded/conf/evbarm.conf | 7 +------
distrib/utils/embedded/conf/evbmips.conf | 7 +------
distrib/utils/embedded/conf/rpi_inst.conf | 4 ++--
distrib/utils/embedded/conf/usermode.conf | 3 +--
distrib/utils/embedded/conf/x86.conf | 6 +-----
5 files changed, 6 insertions(+), 21 deletions(-)
diffs (153 lines):
diff -r f952088d9b53 -r 47d34b744449 distrib/utils/embedded/conf/evbarm.conf
--- a/distrib/utils/embedded/conf/evbarm.conf Tue Jul 06 09:30:07 2021 +0000
+++ b/distrib/utils/embedded/conf/evbarm.conf Tue Jul 06 11:49:36 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.38 2020/12/23 10:35:18 rin Exp $
+# $NetBSD: evbarm.conf,v 1.39 2021/07/06 11:49:36 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -71,7 +71,6 @@
# See /usr/share/examples/fstab/ for more examples.
NAME=${gpt_label_ffs:-netbsd-root} / ffs rw,noatime 1 1
NAME=${gpt_label_boot:-EFI} /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -84,7 +83,6 @@
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,noatime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -100,7 +98,6 @@
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /tmp tmpfs rw,-s32M
@@ -128,8 +125,6 @@
# Missing mount points from fstab
echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
- echo "./kern type=dir uname=root gname=wheel mode=0755" \
- >> "$tmp/selected_sets"
}
customize_evbarm() {
diff -r f952088d9b53 -r 47d34b744449 distrib/utils/embedded/conf/evbmips.conf
--- a/distrib/utils/embedded/conf/evbmips.conf Tue Jul 06 09:30:07 2021 +0000
+++ b/distrib/utils/embedded/conf/evbmips.conf Tue Jul 06 11:49:36 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: evbmips.conf,v 1.2 2020/12/23 10:35:18 rin Exp $
+# $NetBSD: evbmips.conf,v 1.3 2021/07/06 11:49:36 jmcneill Exp $
# evbmips shared config
#
image=$HOME/${board}.img
@@ -71,7 +71,6 @@
# See /usr/share/examples/fstab/ for more examples.
NAME=${gpt_label_ffs:-netbsd-root} / ffs rw,noatime 1 1
NAME=${gpt_label_boot:-boot} /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -84,7 +83,6 @@
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,noatime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@@ -100,7 +98,6 @@
# See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
ROOT.e /boot msdos rw 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /tmp tmpfs rw,-s32M
@@ -128,8 +125,6 @@
# Missing mount points from fstab
echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
- echo "./kern type=dir uname=root gname=wheel mode=0755" \
- >> "$tmp/selected_sets"
}
customize_evbmips() {
diff -r f952088d9b53 -r 47d34b744449 distrib/utils/embedded/conf/rpi_inst.conf
--- a/distrib/utils/embedded/conf/rpi_inst.conf Tue Jul 06 09:30:07 2021 +0000
+++ b/distrib/utils/embedded/conf/rpi_inst.conf Tue Jul 06 11:49:36 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.17 2020/12/01 04:21:10 rin Exp $
+# $NetBSD: rpi_inst.conf,v 1.18 2021/07/06 11:49:36 jmcneill Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -24,7 +24,7 @@
customize() {
echo "${bar} creating directories ${bar}"
- mkdir ${mnt}/proc ${mnt}/kern
+ mkdir ${mnt}/proc
}
make_fstab() {
diff -r f952088d9b53 -r 47d34b744449 distrib/utils/embedded/conf/usermode.conf
--- a/distrib/utils/embedded/conf/usermode.conf Tue Jul 06 09:30:07 2021 +0000
+++ b/distrib/utils/embedded/conf/usermode.conf Tue Jul 06 11:49:36 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: usermode.conf,v 1.5 2015/04/19 18:28:31 hubertf Exp $
+# $NetBSD: usermode.conf,v 1.6 2021/07/06 11:49:36 jmcneill Exp $
# NetBSD/usermode customization script used by mkimage
# XXX: BROKEN, needs to be converted to makefs
@@ -15,7 +15,6 @@
# NetBSD/usermode /etc/fstab
/dev/ld0a / ffs ro 1 1
/dev/ld1a /pkgs ffs ro 1 2
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
# mount /root as tmpfs on top of existing dir
diff -r f952088d9b53 -r 47d34b744449 distrib/utils/embedded/conf/x86.conf
--- a/distrib/utils/embedded/conf/x86.conf Tue Jul 06 09:30:07 2021 +0000
+++ b/distrib/utils/embedded/conf/x86.conf Tue Jul 06 11:49:36 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: x86.conf,v 1.9 2020/12/23 10:35:18 rin Exp $
+# $NetBSD: x86.conf,v 1.10 2021/07/06 11:49:36 jmcneill Exp $
# x86 shared config
#
@@ -58,7 +58,6 @@
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
/dev/${rootdev}0a / ffs rw,log 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
EOF
@@ -72,7 +71,6 @@
# NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples.
/dev/${rootdev}0a / ffs rw,log,noatime,nodevmtime 1 1
-kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw
tmpfs /tmp tmpfs rw,-s32M
@@ -96,8 +94,6 @@
echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
- echo "./kern type=dir uname=root gname=wheel mode=0755" \
- >> "$tmp/selected_sets"
}
customize() {
Home |
Main Index |
Thread Index |
Old Index