--- /sys/src/9/boot/usb.c	Mon Oct 21 23:54:37 2013
+++ /sys/src/9/boot/usb.c	Thu Feb  6 18:45:17 2014
@@ -40,7 +40,8 @@
 	for(cnt = 10; cnt > 0 && access(file, AEXIST) < 0; cnt--)
 		sleep(100);
 	if (cnt <= 0) {
-		fprint(2, "no %s...", file);
+		if(debugboot)
+			fprint(2, "no %s...", file);
 		return -1;
 	}
 	return 0;
--- /sys/src/9/pc/boot.fs	Thu Nov  7 00:22:54 2013
+++ /sys/src/9/pc/boot.fs	Fri Feb  7 01:20:04 2014
@@ -38,15 +38,6 @@
 	echo -n usb...
 	usbd
 }
-if not if (test -e /dev/usb0) {
-	echo -n old usb...
-	usbd
-	if (test -e '#m/mouse')
-		kb -a2
-	if not
-		kb -k
-	disk -l -s usbdisk -m /mnt	# mounts on /mnt/<lun>
-}
 
 echo -n disks...
 if(! ~ $dmaon no)
@@ -97,12 +88,10 @@
 switch (`{sed '/\.(0|255)[	 ]/d' /net/ipselftab}) {
 case 135.104.24.*				# new outside
 	echo 'add 135.104.9.0 255.255.255.0 135.104.24.13' >>/net/iproute
-case 204.178.31.*				# old outside
-	echo 'add 135.104.9.0 255.255.255.0 204.178.31.10' >>/net/iproute
 }
 ipconfig loopback /dev/null 127.1
 
-# local hackery: add extra sr luns
+# local hackery: add extra sr luns of shelf 1
 if (test -e /dev/aoe/1.1 && ! test -e /dev/sdf0)
 	echo config switch on spec f type aoe//dev/aoe/1.1 >/dev/sdctl
 if (test -e /dev/aoe/1.2 && ! test -e /dev/sdg0)
--- /sys/src/9/port/devwd.c	Sat Aug  3 01:00:24 2013
+++ /sys/src/9/port/devwd.c	Thu Feb  6 18:45:07 2014
@@ -77,13 +77,12 @@
 	if (wdautopet || !wd || !wdallowed())
 		return;
 	if (waserror()) {
-		print("watchdog: enable failed\n");
+		print("watchdog: automatic enable failed\n");
 		return;
 	}
 	wd->enable();
 	poperror();
 
-	print("watchdog: on with clock strokes\n");
 	wdautopet = watchdogon = 1;
 	if (!wdclock0called) {
 		addclock0link(wdpet, 200);
@@ -102,7 +101,6 @@
 		return;
 	wdautopet = 0;
 	wdshutdown();
-	print("watchdog: disabled before open\n");
 }
 
 /*
--- /sys/src/cmd/ndb/ipquery.c	Mon Aug 22 13:50:23 2005
+++ /sys/src/cmd/ndb/ipquery.c	Thu Feb  6 17:46:07 2014
@@ -11,7 +11,7 @@
 void
 usage(void)
 {
-	fprint(2, "usage: ipquery attr value rattribute\n");
+	fprint(2, "usage: ipquery [-f ndb-root] attr value rattribute\n");
 	exits("usage");
 }
 
@@ -36,6 +36,9 @@
 	ARGBEGIN{
 	case 'f':
 		dbfile = ARGF();
+		break;
+	default:
+		usage();
 		break;
 	}ARGEND;