2 files changed, 23 insertions(+), 6 deletions(-)

M boot/boot.c
M port/devsd.c

@@ 36,12 36,11 @@ boot(int argc, char *argv[])
 {
 	int fd, afd;
 	Method *mp;
-	char cmd[64];
+	char *cmd, cmdbuf[64], *iargv[16];
 	char rootbuf[64];
-	char flags[6];
 	int islocal, ishybrid;
 	char *rp;
-	int n;
+	int iargc, n;
 	char buf[32];
 	AuthInfo *ai;
 


@@ 154,9 153,24 @@ boot(int argc, char *argv[])
 	settime(islocal, afd);
 	swapproc();
 
-	sprint(cmd, "/%s/ninit", cputype);
-	sprint(flags, "-%s%s", cpuflag ? "c" : "t", mflag ? "m" : "");
-	execl(cmd, "init", flags, 0);
+	cmd = getenv("init");
+	if(cmd == nil){
+		sprint(cmdbuf, "/%s/ninit -%s%s", cputype,
+			cpuflag ? "c" : "t", mflag ? "m" : "");
+		cmd = cmdbuf;
+	}
+	iargc = tokenize(cmd, iargv, nelem(iargv)-1);
+	cmd = iargv[0];
+
+	/* make iargv[0] basename(iargv[0]) */
+	if(iargv[0] = strrchr(iargv[0], '/'))
+		iargv[0]++;
+	else
+		iargv[0] = cmd;
+
+	iargv[iargc] = nil;
+
+	exec(cmd, iargv);
 	fatal(cmd);
 }
 

@@ 1366,6 1366,9 @@ configure(char *spec, DevConf *cf)
 		snprint(name, sizeof(name), "sd%c", *spec);
 		kstrdup(&sdev->name, name);
 		sdev->idno = *spec;
+		sdev->unit = (SDunit **)malloc(sdev->nunit * sizeof(SDunit *));
+		sdev->unitflg = (int *)malloc(sdev->nunit * sizeof(int));
+		assert(sdev->unit && sdev->unitflg);
 
 		devs[ndevs].dt_dev = sdev;
 		devs[ndevs].dt_nunits = sdev->nunit;