summaryrefslogtreecommitdiff
path: root/rc/bin/cpurc
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2016-02-14 01:42:32 +0100
committercinap_lenrek <cinap_lenrek@felloff.net>2016-02-14 01:42:32 +0100
commitecebba779f8cb55dadac70ef1c109e9e69c63423 (patch)
treef003eabc02cfe1f67b6069f946f2d0741607520a /rc/bin/cpurc
parent24150b117110e982496b10c2f1dfef329160a36a (diff)
downloadplan9front-ecebba779f8cb55dadac70ef1c109e9e69c63423.tar.xz
provide /n and /mnt early in bootrc to allow consistent use in /lib/namespace
theres a bootstrap problem: when /bin/init is run, it processes /lib/namespace where we might want to mount or bind resources to /n or /mnt. but mntgen was run later in cpurc/termrc so these mounts would be ignored. we already have mntgen in bootfs, so we can provide these mountpoints early. i keep the termrc/cpurc mntgens where they are, but ignore the error prints. this way old kernels will continue to work.
Diffstat (limited to 'rc/bin/cpurc')
-rwxr-xr-xrc/bin/cpurc7
1 files changed, 4 insertions, 3 deletions
diff --git a/rc/bin/cpurc b/rc/bin/cpurc
index d20cf07e1..38d6745fb 100755
--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -8,10 +8,11 @@ for(i in m i P S t u '$')
mount -qb /srv/cons /dev
-# mount points
-mntgen -s slashn && chmod 666 /srv/slashn
+# mount points (if not done by bootrc already)
+>[2]/dev/null {
+mntgen -s slashn /n && chmod 666 /srv/slashn
mntgen -s slashmnt /mnt && chmod 666 /srv/slashmnt
-mntgen -s mntexport /mnt/exportfs && chmod 666 /srv/mntexport
+mntgen -s mntexport /mnt/exportfs && chmod 666 /srv/mntexport}
# move factotum from /mnt to /mnt/factotum
mount /srv/factotum /mnt/temp