--- a/build-scripts/147/23-onnv-pull-source.sh	Tue Sep 28 16:19:56 2010 +0100
+++ b/build-scripts/147/23-onnv-pull-source.sh	Sun Oct 03 14:10:02 2010 +0100
@@ -16,7 +16,7 @@
 
 #hg clone http://pkgdev.openindiana.org/hg/onnv-gate $MNTPOINT/build/onnv
 #hg clone -U --ssh "ssh -o \"StrictHostKeyChecking no\"" ssh://[email protected]/hg/onnv/onnv-gate $MNTPOINT/build/onnv
-hg clone -U /wd/onnv-gate/onnv-gate $MNTPOINT/build/onnv
-#hg clone -U /ssd/onnv-gate $MNTPOINT/build/onnv
+#hg clone -U /wd/onnv-gate/onnv-gate $MNTPOINT/build/onnv
+hg clone -U /ssd/onnv-gate $MNTPOINT/build/onnv
 
 hg -R $MNTPOINT/build/onnv update -C 13149

--- a/build-scripts/147/24-onnv-patch-source.sh	Tue Sep 28 16:19:56 2010 +0100
+++ b/build-scripts/147/24-onnv-patch-source.sh	Sun Oct 03 14:10:02 2010 +0100
@@ -12,4 +12,4 @@
 
 echo Patching the source
 
-cat patches/onnv-*.diff|(cd $MNTPOINT/build/onnv; gpatch -p1)
+cat patches/onnv-*xvm*.diff|(cd $MNTPOINT/build/onnv; gpatch -p1)

--- a/build-scripts/147/25-onnv-prepare-env-file.sh	Tue Sep 28 16:19:56 2010 +0100
+++ b/build-scripts/147/25-onnv-prepare-env-file.sh	Sun Oct 03 14:10:02 2010 +0100
@@ -16,7 +16,7 @@
 
 cat $MNTPOINT/build/onnv/usr/src/tools/env/opensolaris.sh | \
 sed s/^NIGHTLY_OPTIONS=\".*\"\;/NIGHTLY_OPTIONS=\"-nprt\"\;/ | \
-sed s/GATE=testws\;/GATE=oi_$RELEASE\;/ | \
+sed s/GATE=testws\;/GATE=snv_$RELEASE\;/ | \
 sed s%CODEMGR_WS=\"/export/\$GATE\"\;%CODEMGR_WS=\"/build/onnv\"\;% | \
 sed s%^\#ONBLD_TOOLS=%ONBLD_TOOLS=% \
 > $MNTPOINT/build/onnv/openindiana.sh

--- a/build-scripts/README	Tue Sep 28 16:19:56 2010 +0100
+++ b/build-scripts/README	Sun Oct 03 14:10:02 2010 +0100
@@ -2,7 +2,7 @@
 2. Put extra repo certs and Sun Studio tarballs to ../non-redist
 3. Run:
 
-   pfexec /usr/sbin/usermod -K defaultpriv=basic,proc_chroot $LOGNAME
+   pfexec /usr/sbin/usermod -K defaultpriv=basic,proc_chroot,sys_mount $LOGNAME
 
    To be able to use chroot without using pfexec