Browse Source

Two more tweaks for disk boot.

The disk is working well; no need to pause with an rc any more.

Leave usbd disabled until we can write a run function that will work.

Change-Id: I133e12601c2c6f655ee8ac2b49a6b0c13890f16d
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 8 years ago
parent
commit
82f21d215f
2 changed files with 7 additions and 3 deletions
  1. 4 2
      sys/src/9/boot/boot.c
  2. 3 1
      sys/src/9/boot/local.c

+ 4 - 2
sys/src/9/boot/boot.c

@@ -273,13 +273,15 @@ HaveMethod:
 static void
 usbinit(void)
 {
-	static char usbd[] = "/boot/usbd";
 	print("NOT RUNNING USBD -- run was broken (varargs problem\n");
 	return;
-
+/*
+	static char usbd[] = "/boot/usbd";
+  verify that shell won't block until usbd exits ...
 	if(access("#u/usb/ctl", 0) >= 0 && bind("#u", "/dev", MAFTER) >= 0 &&
 	    access(usbd, AEXIST) >= 0)
 		shell("-c", "/boot/usbd");
+*/
 }
 
 static void

+ 3 - 1
sys/src/9/boot/local.c

@@ -66,6 +66,8 @@ configlocal(Method *mp)
 		 *  is the last resort.
 		 */
 		disk = bootdisk;
+	} else {
+		disk = "#s/sdE0/";
 	}
 print("configlocal: disk is %s\n", disk);
 	/* if we've decided on one, pass it on to all programs */
@@ -78,7 +80,7 @@ print("configlocal: disk is %s\n", disk);
 
 	shell("-c", smprint("/boot/fdisk -p '%s/data' > '%s/ctl'", disk, disk));
 	shell("-c", smprint("/boot/prep -p '%s/plan9' > '%s/ctl'", disk, disk));
-	shell("-i", nil);
+	//shell("-i", nil);
 	USED(mp);
 }