Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable kernfs on live images -- it is not required.

This commit is contained in:
jmcneill 2021-07-06 11:49:36 +00:00
parent 84b16ca6b7
commit 9d6d007b0d
5 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distrib/utils/embedded/conf/evbarm.conf
View File

@ -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 # evbarm shared config
# #
image=$HOME/${board}.img image=$HOME/${board}.img
@ -71,7 +71,6 @@ make_fstab_evbarm_gpt() {
# See /usr/share/examples/fstab/ for more examples. # See /usr/share/examples/fstab/ for more examples.
NAME=${gpt_label_ffs:-netbsd-root} / ffs rw,noatime 1 1 NAME=${gpt_label_ffs:-netbsd-root} / ffs rw,noatime 1 1
NAME=${gpt_label_boot:-EFI} /boot msdos rw 1 1 NAME=${gpt_label_boot:-EFI} /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25 tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@ -84,7 +83,6 @@ make_fstab_evbarm_normal() {
# See /usr/share/examples/fstab/ for more examples. # See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,noatime 1 1 ROOT.a / ffs rw,noatime 1 1
ROOT.e /boot msdos rw 1 1 ROOT.e /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25 tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@ -100,7 +98,6 @@ make_fstab_evbarm_minwrites() {
# See /usr/share/examples/fstab/ for more examples. # See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,log,noatime,nodevmtime 1 1 ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
ROOT.e /boot msdos rw 1 1 ROOT.e /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw procfs /proc procfs rw
tmpfs /tmp tmpfs rw,-s32M tmpfs /tmp tmpfs rw,-s32M
@ -128,8 +125,6 @@ make_fstab_evbarm() {
# Missing mount points from fstab # Missing mount points from fstab
echo "./proc type=dir uname=root gname=wheel mode=0755" \ echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets" >> "$tmp/selected_sets"
echo "./kern type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
} }
customize_evbarm() { customize_evbarm() {

7
distrib/utils/embedded/conf/evbmips.conf
View File

@ -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 # evbmips shared config
# #
image=$HOME/${board}.img image=$HOME/${board}.img
@ -71,7 +71,6 @@ make_fstab_evbmips_gpt() {
# See /usr/share/examples/fstab/ for more examples. # See /usr/share/examples/fstab/ for more examples.
NAME=${gpt_label_ffs:-netbsd-root} / ffs rw,noatime 1 1 NAME=${gpt_label_ffs:-netbsd-root} / ffs rw,noatime 1 1
NAME=${gpt_label_boot:-boot} /boot msdos rw 1 1 NAME=${gpt_label_boot:-boot} /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25 tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@ -84,7 +83,6 @@ make_fstab_evbmips_normal() {
# See /usr/share/examples/fstab/ for more examples. # See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,noatime 1 1 ROOT.a / ffs rw,noatime 1 1
ROOT.e /boot msdos rw 1 1 ROOT.e /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw procfs /proc procfs rw
tmpfs /var/shm tmpfs rw,-m1777,-sram%25 tmpfs /var/shm tmpfs rw,-m1777,-sram%25
@ -100,7 +98,6 @@ make_fstab_evbmips_minwrites() {
# See /usr/share/examples/fstab/ for more examples. # See /usr/share/examples/fstab/ for more examples.
ROOT.a / ffs rw,log,noatime,nodevmtime 1 1 ROOT.a / ffs rw,log,noatime,nodevmtime 1 1
ROOT.e /boot msdos rw 1 1 ROOT.e /boot msdos rw 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw procfs /proc procfs rw
tmpfs /tmp tmpfs rw,-s32M tmpfs /tmp tmpfs rw,-s32M
@ -128,8 +125,6 @@ make_fstab_evbmips() {
# Missing mount points from fstab # Missing mount points from fstab
echo "./proc type=dir uname=root gname=wheel mode=0755" \ echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets" >> "$tmp/selected_sets"
echo "./kern type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
} }
customize_evbmips() { customize_evbmips() {

4
distrib/utils/embedded/conf/rpi_inst.conf
View File

@ -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 # Raspberry Pi customization script used by mkimage
# #
@ -24,7 +24,7 @@ make_label() {
customize() { customize() {
echo "${bar} creating directories ${bar}" echo "${bar} creating directories ${bar}"
mkdir ${mnt}/proc ${mnt}/kern mkdir ${mnt}/proc
} }
make_fstab() { make_fstab() {

3
distrib/utils/embedded/conf/usermode.conf
View File

@ -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 # NetBSD/usermode customization script used by mkimage
# XXX: BROKEN, needs to be converted to makefs # XXX: BROKEN, needs to be converted to makefs
@ -15,7 +15,6 @@ cat > ${mnt}/etc/fstab << EOF
# NetBSD/usermode /etc/fstab # NetBSD/usermode /etc/fstab
/dev/ld0a / ffs ro 1 1 /dev/ld0a / ffs ro 1 1
/dev/ld1a /pkgs ffs ro 1 2 /dev/ld1a /pkgs ffs ro 1 2
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw procfs /proc procfs rw
# mount /root as tmpfs on top of existing dir # mount /root as tmpfs on top of existing dir

6
distrib/utils/embedded/conf/x86.conf
View File

@ -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 # x86 shared config
# #
@ -58,7 +58,6 @@ make_fstab_normal() {
# NetBSD /etc/fstab # NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples. # See /usr/share/examples/fstab/ for more examples.
/dev/${rootdev}0a / ffs rw,log 1 1 /dev/${rootdev}0a / ffs rw,log 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw procfs /proc procfs rw
EOF EOF
@ -72,7 +71,6 @@ make_fstab_minwrites() {
# NetBSD /etc/fstab # NetBSD /etc/fstab
# See /usr/share/examples/fstab/ for more examples. # See /usr/share/examples/fstab/ for more examples.
/dev/${rootdev}0a / ffs rw,log,noatime,nodevmtime 1 1 /dev/${rootdev}0a / ffs rw,log,noatime,nodevmtime 1 1
kernfs /kern kernfs rw
ptyfs /dev/pts ptyfs rw ptyfs /dev/pts ptyfs rw
procfs /proc procfs rw procfs /proc procfs rw
tmpfs /tmp tmpfs rw,-s32M tmpfs /tmp tmpfs rw,-s32M
@ -96,8 +94,6 @@ make_fstab() {
echo "./proc type=dir uname=root gname=wheel mode=0755" \ echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets" >> "$tmp/selected_sets"
echo "./kern type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
} }
customize() { customize() {