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

Conflicts:
	configure
	src/vm/node_modules/VM.js

.gitignore

@@ -9,6 +9,7 @@
 /src/removable_disk
 /src/disklist
 /src/zoneevent
+/src/vm/tests.tar.gz
 /src/node-kstat/.lock-wscript
 /src/node-kstat/build
 /src/node-syslog/.lock-wscript

Makefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011 Joyent Inc., All rights reserved.
+# Copyright (c) 2010-2012 Joyent Inc., All rights reserved.
 
 ROOT=$(PWD)
 PROTO=$(ROOT)/proto
@@ -7,7 +7,9 @@ PATH=/opt/local/bin:/opt/local/sbin:/opt/local/gcc34/bin:/usr/xpg4/bin:/usr/bin:
 LOCAL_SUBDIRS:=$(shell ls projects/local)
 MANIFEST=manifest.gen
 OVERLAYS:=$(shell cat overlay/order)
-
+ifeq ($(EXTRA_TARBALL),)
+EXTRA_TARBALL:=$(shell ls `pwd`/illumos-extra*.tgz | tail -n1 && echo $?)
+endif
 world: 0-illumos-stamp 0-extra-stamp 0-livesrc-stamp 0-local-stamp \
 	0-tools-stamp 0-man-stamp 0-devpro-stamp
 
@@ -69,7 +71,11 @@ update:
 ifeq ($(EXTRA_TARBALL),)
 		(cd $(ROOT)/projects/illumos-extra && gmake DESTDIR=$(PROTO) install)
 else
-		(cd $(PROTO)/../ && gtar -zxf $(EXTRA_TARBALL) proto/)
+ifneq ($(NO_EXTRA_TARBALL),)
+			(cd $(ROOT)/projects/illumos-extra && gmake DESTDIR=$(PROTO) install)
+else
+			(cd $(PROTO)/../ && gtar -zxf $(EXTRA_TARBALL) proto/)
+endif
 endif
 	touch 0-extra-stamp
 

configure

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2010,2011 Joyent Inc.
+# Copyright (c) 2010-2012 Joyent Inc.
 #
 
 set -o errexit
@@ -128,6 +128,13 @@ if [ ! -f "projects/illumos/usr/src/tools/env/illumos.sh" ]; then
   fi
 fi
 
+if [[ -n ${ILLUMOS_EXTRA_TARBALL_URL} && -z ${NO_EXTRA_TARBALL} ]]; then
+	EXTRA_TARBALL=$(curl -k ${ILLUMOS_EXTRA_TARBALL_URL} | grep href | tail -n1 | cut -d '"' -f2)
+	curl -k -O ${ILLUMOS_EXTRA_TARBALL_URL}/${EXTRA_TARBALL}
+	if [[ $? != 0 ]]; then
+		EXTRA_TARBALL=""
+	fi
+fi
 if [[ ! -f "projects/illumos-extra/Makefile" && -z $EXTRA_TARBALL ]]; then
   echo " +--> Getting illumos-extra source tree..."
   if [ -z "${GET_ILLUMOS_EXTRA}" ]; then

configure.local

@@ -27,6 +27,8 @@ mkdir -p projects/local
     || git clone https://github.com/joyent/illumos-kvm.git kvm)
 (cd projects/local && [[ -d kvm-cmd ]] \
     || git clone https://github.com/joyent/illumos-kvm-cmd.git kvm-cmd)
+(cd overlay && [[ -d smartos ]] \
+    || git clone http://github.com/richlowe/smartos-overlay smartos)
 
 # default branch list if there isn't one
 if [[ ! -f configure-branches ]]; then
@@ -49,4 +51,5 @@ ON_CLOSED_BINS_ND_URL="http://dlc.sun.com/osol/on/downloads/20100817/on-closed-b
 GET_ILLUMOS="(git clone -b smartos/local https://github.com/richlowe/illumos-gate illumos)"
 GET_ILLUMOS_EXTRA="git clone https://github.com/joyent/illumos-extra.git illumos-extra"
 
+ILLUMOS_EXTRA_TARBALL_URL="https://download.joyent.com/pub/build/illumos-extra/"
 OVERLAYS="local smartos generic"

overlay/generic/etc/driver_aliases

@@ -452,6 +452,7 @@ igb "pciex8086,1510"
 igb "pciex8086,1511"
 igb "pciex8086,1516"
 igb "pciex8086,1518"
+igb "pciex8086,1521"
 intel_nb5000 "pci8086,25c0"
 intel_nb5000 "pci8086,25d0"
 intel_nb5000 "pci8086,25d4"

overlay/generic/lib/svc/manifest/network/ipfilter.xml

@@ -102,8 +102,8 @@
 	<instance name='default' enabled='true'>
 		<property_group name='firewall_config_default'
 			type='com.sun,fw_configuration'>
-			<propval name='policy' type='astring' value='none' />
-			<propval name='custom_policy_file' type='astring' value='' />
+			<propval name='policy' type='astring' value='custom' />
+      <propval name='custom_policy_file' type='astring' value='/etc/ipf/ipf.conf' />
 			<propval name='apply_to' type='astring' value='' />
 			<propval name='exceptions' type='astring' value='' />
 			<propval name='open_ports' type='astring' value='' />

sample.configure.smartos

@@ -0,0 +1,18 @@
+mkdir -p projects/local
+(cd projects/local && [[ -d kvm ]] \
+    || git clone http://github.com/joyent/illumos-kvm kvm)
+(cd projects/local && [[ -d kvm-cmd ]] \
+    || git clone http://github.com/joyent/illumos-kvm-cmd kvm-cmd)
+(cd overlay && [[ -d smartos ]] \
+    || git clone http://github.com/joyent/smartos-overlay smartos)
+
+PUBLISHER="joyent"
+RELEASE_VER="smartos_20120112"
+SUNW_SPRO12_URL=""
+SUNW_SPRO12u1_URL=""
+ON_CLOSED_BINS_URL="http://dlc.sun.com/osol/on/downloads/20100817/on-closed-bins.i386.tar.bz2"
+ON_CLOSED_BINS_ND_URL="http://dlc.sun.com/osol/on/downloads/20100817/on-closed-bins-nd.i386.tar.bz2"
+GET_ILLUMOS="(git clone -b gcc4 http://github.com/joyent/illumos-joyent illumos)"
+GET_ILLUMOS_EXTRA="git clone http://github.com/joyent/illumos-extra illumos-extra"
+ILLUMOS_EXTRA_TARBALL_URL="https://download.joyent.com/pub/build/illumos-extra/"
+OVERLAYS="smartos generic"