From 3b146d4554fcf262b25ff1b8c074947ad8371528 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Thu, 18 May 2000 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2000-05-18

---
 boot/dosboot.c |  2 +-
 boot/key.c     |  4 ++--
 pc/main.c      | 17 ++++-------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/boot/dosboot.c b/boot/dosboot.c
index 3ebe1faab7cabfae6f336ff73b1f90f17576fdff..203fd82e17794e6a8724f68c2548809881e20235 100644
--- a/boot/dosboot.c
+++ b/boot/dosboot.c
@@ -32,7 +32,7 @@ dosboot(void)
 		fatal("bind /");
 	if(mount(fd, "/", MAFTER|MCREATE, "#f/fd0disk") < 0)
 		if(mount(fd, "/", MAFTER|MCREATE, "#f/fd1disk") < 0)
-			if(mount(fd, "/", MAFTER|MCREATE, "#H/hd0dos") < 0)
+			if(mount(fd, "/", MAFTER|MCREATE, "#S/sdC0/dos") < 0)
 				fatal("mount /");
 	close(fd);
 
diff --git a/boot/key.c b/boot/key.c
index 74cbed2cb8fea7a4002cd4ad5e8e6c29740ac923..bd0149a7d313fd07f3f27dee0fb792f7f7122101 100644
--- a/boot/key.c
+++ b/boot/key.c
@@ -38,9 +38,9 @@ key(int islocal, Method *mp)
 		fd = open("#r/nvram", ORDWR);
 		safeoff = 1024+850;
 	} else if(strcmp(cputype, "386") == 0 || strcmp(cputype, "alpha") == 0){
-		fd = open("#H/hd0nvram", ORDWR);
+		fd = open("#S/sdC0/nvram", ORDWR);
 		if(fd < 0)
-			fd = open("#w/sd0nvram", ORDWR);
+			fd = open("#S/sd00/nvram", ORDWR);
 		if(fd < 0){
 			fd = open("#f/fd0disk", ORDWR);
 			if(fd < 0)
diff --git a/pc/main.c b/pc/main.c
index a1ddd38c841c624ed964efcce60706b28aba1ae1..0319f56e9b85c84062497d58aaa7047a9f497671 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -308,20 +308,11 @@ bootargs(ulong base)
 	av[ac++] = pusharg("/386/9dos");
 	cp[BOOTLINELEN-1] = 0;
 	buf[0] = 0;
-	if(strncmp(cp, "fd!", 3) == 0){
-		sprint(buf, "local!#f/fd%lddisk", strtol(cp+3, 0, 0));
+	if(strncmp(cp, "fd", 2) == 0){
+		sprint(buf, "local!#f/fd%lddisk", strtol(cp+2, 0, 0));
 		av[ac++] = pusharg(buf);
-	} else if(strncmp(cp, "h!", 2) == 0){
-		sprint(buf, "local!#H/hd%ldfs", strtol(cp+2, 0, 0));
-		av[ac++] = pusharg(buf);
-	} else if(strncmp(cp, "hd!", 3) == 0){
-		sprint(buf, "local!#H/hd%lddisk", strtol(cp+3, 0, 0));
-		av[ac++] = pusharg(buf);
-	} else if(strncmp(cp, "s!", 2) == 0){
-		sprint(buf, "local!#w/sd%ldfs", strtol(cp+2, 0, 0));
-		av[ac++] = pusharg(buf);
-	} else if(strncmp(cp, "sd!", 3) == 0){
-		sprint(buf, "local!#w/sd%lddisk", strtol(cp+3, 0, 0));
+	} else if(strncmp(cp, "sd", 2) == 0){
+		sprint(buf, "local!#S/sd%c%c/fs", *(cp+2), *(cp+3));
 		av[ac++] = pusharg(buf);
 	} else if(strncmp(cp, "e!", 2) == 0)
 		av[ac++] = pusharg("-n");