From f5405d8236afd0b970f4774fc56951b3bfd64495 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 2 Oct 2002 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2002-10-02

---
 boot/boot.c    | 5 +++--
 boot/boot.h    | 2 +-
 boot/settime.c | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/boot/boot.c b/boot/boot.c
index b3f685e92c9f62fa2f8e0e799998db98e4d5f290..1aad5f278866bc4cd88f926b15631dab58c62d86 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -26,7 +26,7 @@ boot(int argc, char *argv[])
 	char *cmd, cmdbuf[64], *iargv[16];
 	char rootbuf[64];
 	int islocal, ishybrid;
-	char *rp;
+	char *rp, *rsp;
 	int iargc, n;
 	char buf[32];
 	AuthInfo *ai;
@@ -115,6 +115,7 @@ boot(int argc, char *argv[])
 	}
 	if(mount(fd, afd, "/root", MREPL|MCREATE, rp) < 0)
 		fatal("mount /");
+	rsp = rp;
 	rp = getenv("rootdir");
 	if(rp == nil)
 		rp = rootdir;
@@ -139,7 +140,7 @@ boot(int argc, char *argv[])
 	close(fd);
 	setenv("rootdir", rp);
 
-	settime(islocal, afd);
+	settime(islocal, afd, rsp);
 	swapproc();
 
 	cmd = getenv("init");
diff --git a/boot/boot.h b/boot/boot.h
index 1e1a30c59eb10fec73d6cffc9546271d7ec6e6d8..563d85f26b2d2d09a9d1c931d74025427bddad8d 100644
--- a/boot/boot.h
+++ b/boot/boot.h
@@ -41,7 +41,7 @@ extern int	readfile(char*, char*, int);
 extern long	readn(int, void*, long);
 extern int	sendmsg(int, char*);
 extern void	setenv(char*, char*);
-extern void	settime(int, int);
+extern void	settime(int, int, char*);
 extern void	srvcreate(char*, int);
 extern void	setusername(int, Method*);
 extern void	warning(char*);
diff --git a/boot/settime.c b/boot/settime.c
index 8e9ceac107a978daa4466e1b79ae3bfd4cd38c00..d9be7585ce3b1e5aa0117f3d45827cc1a6b280ad 100644
--- a/boot/settime.c
+++ b/boot/settime.c
@@ -9,7 +9,7 @@ static long lusertime(char*);
 char *timeserver = "#s/boot";
 
 void
-settime(int islocal, int afd)
+settime(int islocal, int afd, char *rp)
 {
 	int n, f;
 	int timeset;
@@ -41,7 +41,7 @@ settime(int islocal, int afd)
 		f = open(timeserver, ORDWR);
 		if(f < 0)
 			return;
-		if(mount(f, afd, "/tmp", MREPL, "") < 0){
+		if(mount(f, afd, "/tmp", MREPL, rp) < 0){
 			warning("settime mount");
 			close(f);
 			return;