3 files changed, 7 insertions(+), 16 deletions(-)

M boot/dosboot.c
M boot/key.c
M pc/main.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);
 

@@ 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)

@@ 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");