From ecebba779f8cb55dadac70ef1c109e9e69c63423 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sun, 14 Feb 2016 01:42:32 +0100 Subject: 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. --- rc/bin/cpurc | 7 ++++--- rc/bin/termrc | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'rc') 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 diff --git a/rc/bin/termrc b/rc/bin/termrc index cd40ec7a6..74b3566dd 100755 --- a/rc/bin/termrc +++ b/rc/bin/termrc @@ -9,10 +9,11 @@ rm -f /env/i 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 -- cgit v1.2.3