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

---
 alphapc/devvga.c | 1 +
 pc/devvga.c      | 1 +
 port/devsd.c     | 7 ++++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/alphapc/devvga.c b/alphapc/devvga.c
index 17f8f7f9ca4fdebcfb36a305e226c33f2846f380..452a3cf42a9b0519934d47e9f85505e6a42d72e4 100644
--- a/alphapc/devvga.c
+++ b/alphapc/devvga.c
@@ -329,6 +329,7 @@ vgactl(char* a)
 		if(n < 2)
 			error(Ebadarg);
 		blanktime = strtoul(field[1], 0, 0);
+		return;
 	}
 	else if(strcmp(field[0], "hwaccel") == 0){
 		if(n < 2)
diff --git a/pc/devvga.c b/pc/devvga.c
index 4666710e3412f3bedbe91895edfb74fe4dc304b1..9b66bbfc719bdbc60ac17d631fb1385c0c2ebef8 100644
--- a/pc/devvga.c
+++ b/pc/devvga.c
@@ -309,6 +309,7 @@ vgactl(char* a)
 		if(n < 2)
 			error(Ebadarg);
 		blanktime = strtoul(field[1], 0, 0);
+		return;
 	}
 	else if(strcmp(field[0], "hwaccel") == 0){
 		if(n < 2)
diff --git a/port/devsd.c b/port/devsd.c
index 12a189503b49de889e3c32a1a358d9454c373c83..19fed982130e7901192531de5d93f130f4ecc9c4 100644
--- a/port/devsd.c
+++ b/port/devsd.c
@@ -128,7 +128,7 @@ sdinitpart(SDunit* unit)
 {
 	int nf;
 	ulong start, end;
-	char *f[4], *p, *q;
+	char *f[4], *p, *q, buf[10];
 
 	unit->sectors = unit->secsize = 0;
 	unit->npart = 0;
@@ -157,12 +157,13 @@ sdinitpart(SDunit* unit)
 		/*
 		 * Use partitions passed from boot program,
 		 * e.g.
-		 *	sdC0=dos 63 123123/plan9 123123 456456
+		 *	sdC0part=dos 63 123123/plan9 123123 456456
 		 * This happens before /boot sets hostname so the
 		 * partitions will have the null-string for user.
 		 * The gen functions patch it up.
 		 */
-		for(p = getconf(unit->name); p != nil; p = q){
+		snprint(buf, sizeof buf, "%spart", unit->name);
+		for(p = getconf(buf); p != nil; p = q){
 			if(q = strchr(p, '/'))
 				*q++ = '\0';
 			nf = getfields(p, f, nelem(f), 1, " \t\r");