From f22b4ecc77afe5ffb81560000fcacb9e3b1744f8 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Sun, 5 May 2019 17:02:37 +0200
Subject: bootrc: fix $rootdir and $rootspec handling (thanks lucio)

we did not interpret the $rootdir and $rootspec environment
variables right. $rootdir is what gets bound to / (usually /root)
and $rootspec is the mountspec of /root.
---
 sys/src/9/boot/bootrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc
index 27a8d80c1..36a71e38d 100755
--- a/sys/src/9/boot/bootrc
+++ b/sys/src/9/boot/bootrc
@@ -130,7 +130,7 @@ fn main{
 	# mount root filesystem
 	if(~ $#rootdir 0)
 		rootdir=/root
-	must mount -c /srv/boot $rootdir
+	must mount -c '#s/boot' /root $rootspec
 
 	# compile init command
 	if(~ $#init 0){
@@ -151,7 +151,7 @@ fn main{
 
 	# create the name space, mount the root fs
 	/mnt/broot/$cputype/bin/bind / /
-	/mnt/broot/$cputype/bin/mount -ac '#s/boot' /
+	/mnt/broot/$cputype/bin/bind -ac $rootdir /
 
 	# remove the remaining temporary root
 	/mnt/broot/$cputype/bin/unmount /mnt/broot
-- 
cgit v1.2.3