Merge branch 'master' of https://github.com/joyent/smartos-live

.gitignore

@@ -1,9 +1,13 @@
 /configure.*
 /configure-*
 /output
+/output-iso
+/output-usb
+/output-vmware
 /projects
 /proto
 /proto.boot
+/proto.images
 /proto.strap
 /log
 /src/*.o
@@ -13,15 +17,26 @@
 /src/removable_disk
 /src/disklist
 /src/qemu-exec
+/src/sysevent
 /src/vmunbundle
 /src/zfs_recv
 /src/zfs_send
 /src/zoneevent
+/src/img/tmp
+/src/nomknod.so.32
+/src/nomknod.so.64
 /src/vm/tests.tar.gz
 /src/node-kstat/.lock-wscript
 /src/node-kstat/build
 /src/node-syslog/.lock-wscript
 /src/node-syslog/build
+/src/node-zsock/lib/zsock_bindings.node
+/src/node-zutil/lib/zutil_bindings.node
+/src/node-*/src/*.o
+/src/node-*/src/mapfile_node
+/src/node-*/src/v8plus_errno.c
+/src/node-*/src/v8plus_errno.h
+/src/ntp_config
 /tools/builder/builder
 /tools/builder/*.o
 /tools/builder/users.c
@@ -42,14 +57,18 @@ ronn-format.7
 man/man/man1m/vfsstat.1m
 man/man/man1m/ziostat.1m
 man/man/man1m/dsadm.1m
+man/man/man1m/fwadm.1m
 man/man/man1m/imgadm.1m
 man/man/man1m/nictagadm.1m
+man/man/man1m/sysevent.1m
 man/man/man1m/vmadm.1m
 man/man/man1m/vmadmd.1m
 man/man/man1m/sysinfo.1m
 man/man/man1m/diskinfo.1m
 man/man/man1m/disklayout.1m
 man/man/man1m/mkzpool.1m
+man/man/man5/fwrule.5
+src/cryptpass
 src/diskinfo
 src/disklayout
 src/mkzpool
@@ -62,13 +81,17 @@ src/node-zsock/build/
 src/node-zutil/.lock-wscript
 src/node-zutil/build/
 src/sdc-on-tty
+src/sysinfo_mod.so
 src/vm/node_modules/props.js
 tools/pwgen-2.06/Makefile
 tools/pwgen-2.06/autom4te.cache
 boot.manifest.gen
 manifest.gen
 boot.manifest.d/
 manifest.d/
+mancheck.conf.d/
 overlay/order
 overlay/sdc
+overlay/smartos
 pkgsrc/*.tgz
+.*.swp