# HG changeset patch
# User John Floren <john@jfloren.net>
# Date 1320692763 0
# Node ID 82608802c1a5ad42a3a704334855639f62d5399e
# Parent  736e872910393bb8fd813c5404cffc05ed88703f
.hgignore: Ignore /sys/log
mknixboot: updated the script a bit

R=nix-dev, nemo
CC=nix-dev
http://codereview.appspot.com/5338045

diff -r 736e87291039 -r 82608802c1a5 .hgignore
--- a/.hgignore	Fri Nov 04 22:53:29 2011 +0000
+++ b/.hgignore	Mon Nov 07 19:06:03 2011 +0000
@@ -12,6 +12,7 @@
 ^fd/
 ^mnt/
 ^dev/
+^sys/log/
 syntax: glob
 *.a
 *.a[568]
diff -r 736e87291039 -r 82608802c1a5 usr/glenda/mknixboot
--- a/usr/glenda/mknixboot	Fri Nov 04 22:53:29 2011 +0000
+++ b/usr/glenda/mknixboot	Mon Nov 07 19:06:03 2011 +0000
@@ -15,7 +15,7 @@
 size=1900
 
 # by default we shall use /$objtype/9load, but you don't have to
-loader=/$objtype/9load
+loader=/$objtype/9loadusb
 
 fn usage {
 	echo usage: $argv0 '[-p proto] [-r root] [-s 10⁶-bytes]' >[1=2]
@@ -83,7 +83,7 @@
 echo -n 9fat... >[1=2]
 cp $loader /tmp/9load	# force format to use the name `9load'
 disk/format -b /$objtype/pbslba -d -r 2 9fat /tmp/9load $k \
-	$syscfg/usb/plan9.ini >[2=1] |
+	$srcroot^$syscfg/usb/plan9.ini >[2=1] |
 	grep -v '^(add .* at clust |Init|type |Adding file|used )'
 cp /dev/zero nvram >[2]/dev/null
 #cp /dev/zero fscfg >[2]/dev/null