FreeNAS

Revision: 9403
          http://freenas.svn.sourceforge.net/freenas/?rev=9403&view=rev
Author:   yaberauneya
Date:     2012-01-03 18:06:26 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Add the missing xvid ports patch so the port will build cleanly under amd64 100% of the time.

Added Paths:
-----------
    branches/8.0.3-mm/patches/ports-xvid.patch

Copied: branches/8.0.3-mm/patches/ports-xvid.patch (from rev 8019, trunk/patches/ports-xvid.patch)
===================================================================
--- branches/8.0.3-mm/patches/ports-xvid.patch	                        (rev 0)
+++ branches/8.0.3-mm/patches/ports-xvid.patch	2012-01-03 18:06:26 UTC (rev 9403)
@@ -0,0 +1,10 @@
+--- multimedia/xvid/Makefile	2011-09-28 07:22:40.000000000 -0700
++++ multimedia/xvid/Makefile	2011-09-28 07:23:02.000000000 -0700
+@@ -15,6 +15,7 @@
+ MAINTAINER=	fluffy@...
+ COMMENT=	An opensource MPEG-4 codec, based on OpenDivx
+ 
++USE_GMAKE=	yes
+ GNU_CONFIGURE=	yes
+ MAKE_JOBS_SAFE=	yes
+ USE_LDCONFIG=	yes

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9402
          http://freenas.svn.sourceforge.net/freenas/?rev=9402&view=rev
Author:   zippybr
Date:     2012-01-03 17:48:18 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
handle error for io.frame requests as well

Modified Paths:
--------------
    trunk/gui/media/lib/js/freeadmin.js

Modified: trunk/gui/media/lib/js/freeadmin.js
===================================================================
--- trunk/gui/media/lib/js/freeadmin.js	2012-01-03 17:10:38 UTC (rev 9401)
+++ trunk/gui/media/lib/js/freeadmin.js	2012-01-03 17:48:18 UTC (rev 9402)
@@ -836,6 +836,23 @@
             }
         };
 
+        var errorHandle = function(data) {
+
+            setMessage(gettext('An error occurred!'), "error");
+
+            try {
+               rnode.hide();
+            } catch(err2) {
+                dojo.query('input[type=button],input[type=submit]', item.domNode).forEach(
+                  function(inputElem){
+                       dijit.getEnclosingWidget(inputElem).set('disabled',false);
+                   }
+                );
+
+                dijit.getEnclosingWidget(dojo.query('input[type=submit]', item.domNode)[0]).set('label','Save');
+            }
+        }
+
         // are there any files to be submited?
         var files = dojo.query("input[type=file]", item.domNode);
         if(files.length > 0) {
@@ -847,7 +864,7 @@
                 handleAs: 'text',
                 //headers: {"X-CSRFToken": dojo.cookie('csrftoken')},
                 load: loadOk,
-	            error: function(response, ioArgs) { },
+	            error: errorHandle,
              });
 
         } else {
@@ -861,22 +878,7 @@
                 content: newData,
                 handleAs: 'text',
                 load: loadOk,
-                error: function(data) {
-
-                        setMessage(gettext('An error occurred!'), "error");
-
-                        try {
-                           rnode.hide();
-                        } catch(err2) {
-                            dojo.query('input[type=button],input[type=submit]', item.domNode).forEach(
-                              function(inputElem){
-                                   dijit.getEnclosingWidget(inputElem).set('disabled',false);
-                               }
-                            );
-
-                            dijit.getEnclosingWidget(dojo.query('input[type=submit]', item.domNode)[0]).set('label','Save');
-                        }
-                 }
+                error: errorHandle,
              });
 
          }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9401
          http://freenas.svn.sourceforge.net/freenas/?rev=9401&view=rev
Author:   zippybr
Date:     2012-01-03 17:10:38 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
add help_text for Remote ZFS filesystem

Modified Paths:
--------------
    trunk/gui/storage/models.py

Modified: trunk/gui/storage/models.py
===================================================================
--- trunk/gui/storage/models.py	2012-01-03 14:24:35 UTC (rev 9400)
+++ trunk/gui/storage/models.py	2012-01-03 17:10:38 UTC (rev 9401)
@@ -435,7 +435,8 @@
             verbose_name = _("Remote Host"),
             )
     repl_zfs = models.CharField(max_length=120,
-            verbose_name = _("Remote ZFS filesystem"),
+            verbose_name = _("Remote ZFS filesystem name"),
+            help_text = _("This should be the name of the ZFS filesystem on remote side. eg: poolname/datasetname not the mountpoint or filesystem path"),
             )
     repl_userepl = models.BooleanField(
             default = False,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9396
          http://freenas.svn.sourceforge.net/freenas/?rev=9396&view=rev
Author:   daoyama
Date:     2012-01-03 09:40:12 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Add ZFS list and status to report mail.

Modified Paths:
--------------
    legacy/build/CHANGES
    legacy/etc/inc/report.inc

Modified: legacy/build/CHANGES
===================================================================
--- legacy/build/CHANGES	2012-01-03 09:05:56 UTC (rev 9395)
+++ legacy/build/CHANGES	2012-01-03 09:40:12 UTC (rev 9396)
@@ -44,6 +44,7 @@
 - Allow last newline of certificate.
 - Add DBCS Codepages for legacy OS.
 - Add LCDproc service.
+- Add ZFS list and status to report mail.
 
 Bug fixes:
 - Fix the problem which discards the DNS settings from a DHCP server.

Modified: legacy/etc/inc/report.inc
===================================================================
--- legacy/etc/inc/report.inc	2012-01-03 09:05:56 UTC (rev 9395)
+++ legacy/etc/inc/report.inc	2012-01-03 09:40:12 UTC (rev 9396)
@@ -1,11 +1,14 @@
 <?php
 /*
 	report.inc
+	Copyright (C) 2005-2012 FreeNAS Project.
+	All rights reserved.
+
 	Copyright (c) 2007-2009 Volker Theile (votdev@...)
 	All rights reserved.
 
 	part of FreeNAS (http://freenas.org)
-	Copyright (C) 2005-2009 Olivier Cochard-Labbe <olivier@...>.
+	Copyright (C) 2005-2012 Olivier Cochard-Labbe <olivier@...>.
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -275,6 +278,8 @@
 		$statusreport->AddArticle(new StatusReportArticleCmd("Processes","ps xauww"));
 		$statusreport->AddArticle(new StatusReportArticleCmd("Memory","top -b 0 | grep Mem"));
 		$statusreport->AddArticle(new StatusReportArticleCmd("Swap usage","/usr/sbin/swapinfo"));
+		$statusreport->AddArticle(new StatusReportArticleCmd("ZFS pool list","/sbin/zpool list"));
+		$statusreport->AddArticle(new StatusReportArticleCmd("ZFS pool status","/sbin/zpool status"));
 		$statusreport->AddArticle(new StatusReportArticleCmd("ATA disk","/sbin/atacontrol list"));
 		$statusreport->AddArticle(new StatusReportArticleCmd("SCSI disk","/sbin/camcontrol devlist"));
 		$disklist = get_physical_disks_list();
@@ -366,6 +371,8 @@
 	$statusreport->AddArticle(new StatusReportArticleCmd("Network performances","netstat -m"));
 	$statusreport->AddArticle(new StatusReportArticleCmd("Memory","top -b 0 | grep Mem"));
 	$statusreport->AddArticle(new StatusReportArticleCmd("Swap usage","/usr/sbin/swapinfo"));
+	$statusreport->AddArticle(new StatusReportArticleCmd("ZFS pool list","/sbin/zpool list"));
+	$statusreport->AddArticle(new StatusReportArticleCmd("ZFS pool status","/sbin/zpool status"));
 	$statusreport->AddArticle(new StatusReportArticleCmd("ATA disk","/sbin/atacontrol list"));
 	$statusreport->AddArticle(new StatusReportArticleCmd("SCSI disk","/sbin/camcontrol devlist"));
 	$disklist = get_physical_disks_list();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9399
          http://freenas.svn.sourceforge.net/freenas/?rev=9399&view=rev
Author:   zippybr
Date:     2012-01-03 12:18:06 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
do not break in case os.remove fails

Modified Paths:
--------------
    trunk/nanobsd/Files/usr/local/bin/graph.py

Modified: trunk/nanobsd/Files/usr/local/bin/graph.py
===================================================================
--- trunk/nanobsd/Files/usr/local/bin/graph.py	2012-01-03 12:05:28 UTC (rev 9398)
+++ trunk/nanobsd/Files/usr/local/bin/graph.py	2012-01-03 12:18:06 UTC (rev 9399)
@@ -54,8 +54,14 @@
             File.WriteString(md5_path, new_md5)
             return False
         else:
-            os.remove(md5_path)
-            os.remove(path)
+            try:
+                os.remove(md5_path)
+            except:
+                pass
+            try:
+                os.remove(path)
+            except:
+                pass
         return True
 
 times = ['1h', '1d', '1w', '1m', '1y']

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9398
          http://freenas.svn.sourceforge.net/freenas/?rev=9398&view=rev
Author:   zippybr
Date:     2012-01-03 12:05:28 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
bugfix: iscsi target auth ix-istgt

Modified Paths:
--------------
    trunk/nanobsd/Files/etc/rc.d/ix-istgt

Modified: trunk/nanobsd/Files/etc/rc.d/ix-istgt
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-istgt	2012-01-03 11:55:29 UTC (rev 9397)
+++ trunk/nanobsd/Files/etc/rc.d/ix-istgt	2012-01-03 12:05:28 UTC (rev 9398)
@@ -184,7 +184,7 @@
 		      FROM services_iscsitargetauthcredential
 		      WHERE iscsi_target_auth_tag=${iscsi_target_auth_tag}
 		      ORDER BY id" | \
-		while $f2; do
+		while eval read -r $f2; do
 			echo "  Auth \"${iscsi_target_auth_user}\" \"${iscsi_target_auth_secret}\" \"${iscsi_target_auth_peeruser}\" \"${iscsi_target_auth_peersecret}\""
 		done
 		echo

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9392
          http://freenas.svn.sourceforge.net/freenas/?rev=9392&view=rev
Author:   yaberauneya
Date:     2012-01-03 06:21:15 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
s/CYB0RG/AVATAR/ig

The term "avatar" is a much better name for a base platform abstraction project than cyb0rg.

Modified Paths:
--------------
    trunk/build/create_iso.sh
    trunk/build/create_servicepack.sh
    trunk/build/do_build.sh
    trunk/build/functions.sh
    trunk/build/nano_env
    trunk/nanobsd/freenas-common

Modified: trunk/build/create_iso.sh
===================================================================
--- trunk/build/create_iso.sh	2012-01-03 04:00:26 UTC (rev 9391)
+++ trunk/build/create_iso.sh	2012-01-03 06:21:15 UTC (rev 9392)
@@ -6,16 +6,16 @@
 
 main()
 {
-	export CYB0RG_ROOT=$(realpath "$(dirname "$0")/..")
-	. "$CYB0RG_ROOT/build/nano_env"
-	. "$CYB0RG_ROOT/build/functions.sh"
+	export AVATAR_ROOT=$(realpath "$(dirname "$0")/..")
+	. "$AVATAR_ROOT/build/nano_env"
+	. "$AVATAR_ROOT/build/functions.sh"
 
 	requires_root
 
 	# Keep in sync with freenas-common and nano_env.
 	IMGFILE="${NANO_OBJ}/$NANO_IMGNAME.Full_Install.xz"
 	TEMP_IMGFILE="${NANO_OBJ}/_.imgfile" # Scratch file for image
-	ETC_FILES="$CYB0RG_ROOT/build/files"
+	ETC_FILES="$AVATAR_ROOT/build/files"
 
 	# Various mount points needed to build the CD, adjust to taste
 	STAGEDIR="${NANO_OBJ}/_.stage" # Scratch location for making filesystem image
@@ -39,7 +39,7 @@
 
 	cleanup
 
-	cd "$CYB0RG_ROOT"
+	cd "$AVATAR_ROOT"
 
 	mkdir -p ${STAGEDIR}/dev ${ISODIR}/data
 

Modified: trunk/build/create_servicepack.sh
===================================================================
--- trunk/build/create_servicepack.sh	2012-01-03 04:00:26 UTC (rev 9391)
+++ trunk/build/create_servicepack.sh	2012-01-03 06:21:15 UTC (rev 9392)
@@ -39,9 +39,9 @@
 	rm -Rf $PREFIX
 }
 
-CYB0RG_ROOT="$(realpath "$(dirname "$0")/..")"
-. "$CYB0RG_ROOT/build/nano_env"
-. "$CYB0RG_ROOT/build/functions.sh"
+AVATAR_ROOT="$(realpath "$(dirname "$0")/..")"
+. "$AVATAR_ROOT/build/nano_env"
+. "$AVATAR_ROOT/build/functions.sh"
 
 requires_root
 

Modified: trunk/build/do_build.sh
===================================================================
--- trunk/build/do_build.sh	2012-01-03 04:00:26 UTC (rev 9391)
+++ trunk/build/do_build.sh	2012-01-03 06:21:15 UTC (rev 9392)
@@ -21,7 +21,7 @@
 # Number of jobs to pass to make. Only applies to src so far.
 MAKE_JOBS=$(( 2 * $(sysctl -n kern.smp.cpus) + 1 ))
 # Should we update src + ports?
-if [ -f $CYB0RG_ROOT/FreeBSD/.pulled ]; then
+if [ -f $AVATAR_ROOT/FreeBSD/.pulled ]; then
 	UPDATE=false
 else
 	UPDATE=true
@@ -89,13 +89,13 @@
 	fi
 	echo "Checking out tree from ${FREEBSD_CVSUP_HOST}..."
 
-	mkdir -p $CYB0RG_ROOT/FreeBSD
+	mkdir -p $AVATAR_ROOT/FreeBSD
 
-	SUPFILE=$CYB0RG_ROOT/FreeBSD/supfile
+	SUPFILE=$AVATAR_ROOT/FreeBSD/supfile
 	cat <<EOF > $SUPFILE
 *default host=${FREEBSD_CVSUP_HOST}
-*default base=$CYB0RG_ROOT/FreeBSD/sup
-*default prefix=$CYB0RG_ROOT/FreeBSD
+*default base=$AVATAR_ROOT/FreeBSD/sup
+*default prefix=$AVATAR_ROOT/FreeBSD
 *default release=cvs
 *default delete use-rel-suffix
 *default compress
@@ -111,32 +111,32 @@
 	# Do this here before running csup because it will pave over all files
 	# that were previously added via a patch if it turns out that a change
 	# was rolled into src or ports.
-	for file in $(find $CYB0RG_ROOT/FreeBSD -name '*.orig' -size 0); do
+	for file in $(find $AVATAR_ROOT/FreeBSD -name '*.orig' -size 0); do
 		rm -f "$(echo $file | sed -e 's/.orig$//')"
 	done
 	csup -L 1 $SUPFILE
 	# Force a repatch because csup pulls pristine sources.
-	: > $CYB0RG_ROOT/FreeBSD/src-patches
-	: > $CYB0RG_ROOT/FreeBSD/ports-patches
-	: > $CYB0RG_ROOT/FreeBSD/.pulled
+	: > $AVATAR_ROOT/FreeBSD/src-patches
+	: > $AVATAR_ROOT/FreeBSD/ports-patches
+	: > $AVATAR_ROOT/FreeBSD/.pulled
 fi
 
-for patch in $(cd $CYB0RG_ROOT/patches && ls freebsd-*.patch); do
-	if ! grep -q $patch $CYB0RG_ROOT/FreeBSD/src-patches; then
+for patch in $(cd $AVATAR_ROOT/patches && ls freebsd-*.patch); do
+	if ! grep -q $patch $AVATAR_ROOT/FreeBSD/src-patches; then
 		echo "Applying patch $patch..."
 		(cd FreeBSD/src &&
-		 patch -C -p0 < $CYB0RG_ROOT/patches/$patch &&
-		 patch -E -p0 -s < $CYB0RG_ROOT/patches/$patch)
-		echo $patch >> $CYB0RG_ROOT/FreeBSD/src-patches
+		 patch -C -p0 < $AVATAR_ROOT/patches/$patch &&
+		 patch -E -p0 -s < $AVATAR_ROOT/patches/$patch)
+		echo $patch >> $AVATAR_ROOT/FreeBSD/src-patches
 	fi
 done
-for patch in $(cd $CYB0RG_ROOT/patches && ls ports-*.patch); do
-	if ! grep -q $patch $CYB0RG_ROOT/FreeBSD/ports-patches; then
+for patch in $(cd $AVATAR_ROOT/patches && ls ports-*.patch); do
+	if ! grep -q $patch $AVATAR_ROOT/FreeBSD/ports-patches; then
 		echo "Applying patch $patch..."
 		(cd FreeBSD/ports &&
-		 patch -C -p0 < $CYB0RG_ROOT/patches/$patch &&
-		 patch -E -p0 -s < $CYB0RG_ROOT/patches/$patch)
-		echo $patch >> $CYB0RG_ROOT/FreeBSD/ports-patches
+		 patch -C -p0 < $AVATAR_ROOT/patches/$patch &&
+		 patch -E -p0 -s < $AVATAR_ROOT/patches/$patch)
+		echo $patch >> $AVATAR_ROOT/FreeBSD/ports-patches
 	fi
 done
 
@@ -157,7 +157,7 @@
 elif [ $FORCE_BUILD -eq 1 ]; then
 	extra_args="$extra_args -n"
 fi
-cmd="$CYB0RG_ROOT/build/nanobsd/nanobsd.sh $args $* $extra_args -j $MAKE_JOBS"
+cmd="$AVATAR_ROOT/build/nanobsd/nanobsd.sh $args $* $extra_args -j $MAKE_JOBS"
 echo $cmd
 if ! $BUILD; then
 	exit 0

Modified: trunk/build/functions.sh
===================================================================
--- trunk/build/functions.sh	2012-01-03 04:00:26 UTC (rev 9391)
+++ trunk/build/functions.sh	2012-01-03 06:21:15 UTC (rev 9392)
@@ -12,7 +12,7 @@
 }
 
 #nano_env_vars() {
-#	grep '^export' "$CYB0RG_ROOT/build/nano_env" | \
+#	grep '^export' "$AVATAR_ROOT/build/nano_env" | \
 #	    sed -e 's/export //g' | tr '\012' ' '
 #}
 

Modified: trunk/build/nano_env
===================================================================
--- trunk/build/nano_env	2012-01-03 04:00:26 UTC (rev 9391)
+++ trunk/build/nano_env	2012-01-03 06:21:15 UTC (rev 9392)
@@ -8,7 +8,7 @@
 # other build / image generation scripts.
 
 # The FreeNAS source and build tree is rooted here.
-: ${CYB0RG_ROOT=$(pwd)}
+: ${AVATAR_ROOT=$(pwd)}
 
 # The architecture for the machine (amd64, i386, etc).
 # NOTE: have to do things this way because nanobsd.sh sets this value
@@ -36,19 +36,19 @@
 	;;
 esac
 
-NANO_OBJ=${CYB0RG_ROOT}/obj.${NANO_ARCH}
+NANO_OBJ=${AVATAR_ROOT}/obj.${NANO_ARCH}
 
 # Where the build configuration files used by nanobsd.sh live.
-NANO_CFG_BASE=$CYB0RG_ROOT/nanobsd
+NANO_CFG_BASE=$AVATAR_ROOT/nanobsd
 
 # Where the FreeBSD ports tree lives.
-NANO_PORTS="$CYB0RG_ROOT/FreeBSD/ports"
+NANO_PORTS="$AVATAR_ROOT/FreeBSD/ports"
 
 # Where the FreeBSD source tree lives.
-NANO_SRC="$CYB0RG_ROOT/FreeBSD/src"
+NANO_SRC="$AVATAR_ROOT/FreeBSD/src"
 
 # Where the nanobsd tools live.
-NANO_TOOLS="$CYB0RG_ROOT/build/nanobsd"
+NANO_TOOLS="$AVATAR_ROOT/build/nanobsd"
 
 if [ -z "${SVNVERSION}" ]; then
 	# This is executed sometimes as set -e; don't let it fail by no-oping
@@ -58,7 +58,7 @@
 
 	if [ -n "$svnversion" ] ; then
 		# svn prints out errors to stdout. Bad svn! No cookie for you!
-		svn=$(sh -c "echo r\$(cd ${CYB0RG_ROOT} && /usr/bin/env LANG=C $svnversion)") || svn=""
+		svn=$(sh -c "echo r\$(cd ${AVATAR_ROOT} && /usr/bin/env LANG=C $svnversion)") || svn=""
 	fi
 	[ "${svn}" = "rUnversioned directory" ] && svn=""
 	if [ -z "$svn" ]; then
@@ -78,7 +78,7 @@
 					git="${git}"
 				fi
 			fi
-			if $git_cmd --work-tree=${CYB0RG_ROOT} diff-index \
+			if $git_cmd --work-tree=${AVATAR_ROOT} diff-index \
 			    --name-only HEAD | read dummy; then
 				git="${git}_dirty"
 			fi
@@ -117,7 +117,7 @@
 NANO_IMGNAME="$NANO_NAME"
 
 # Export these vars to override the NanoBSD defaults.
-export CYB0RG_ROOT FREENAS_ARCH
+export AVATAR_ROOT FREENAS_ARCH
 export NANO_ARCH NANO_ARCH_HUMANIZED NANO_CFG_BASE NANO_IMGNAME NANO_KERNEL
 export NANO_MODULES NANO_NAME NANO_OBJ NANO_SRC NANO_TOOLS REVISION
 export SVNREVISION

Modified: trunk/nanobsd/freenas-common
===================================================================
--- trunk/nanobsd/freenas-common	2012-01-03 04:00:26 UTC (rev 9391)
+++ trunk/nanobsd/freenas-common	2012-01-03 06:21:15 UTC (rev 9392)
@@ -33,9 +33,9 @@
 #
 
 # Override the defaults in nanobsd.sh from a common script.
-. "$CYB0RG_ROOT/build/nano_env"
+. "$AVATAR_ROOT/build/nano_env"
 # Helpful functions.
-. "$CYB0RG_ROOT/build/functions.sh"
+. "$AVATAR_ROOT/build/functions.sh"
 
 # DEBUG=1, MULTIMEDIA=1, etc.
 for feature in $SW_FEATURES; do
@@ -352,7 +352,7 @@
 add_gui()
 {
     local gui dst dstCR
-    gui=${CYB0RG_ROOT}/gui
+    gui=${AVATAR_ROOT}/gui
     dstCR=/usr/local/www/freenasUI
     dst=${NANO_WORLDDIR}${dstCR}
     if [ -d ${gui} ]; then
@@ -564,13 +564,13 @@
 }
 customize_cmd fix_fuse_module_location
 
-cyb0rg_config()
+avatar_config()
 {
-	cat > ${NANO_OBJ}/cyb0rg.conf <<EOF
+	cat > ${NANO_OBJ}/avatar.conf <<EOF
 #!/bin/sh
 #
 # A simple, sourceable script that can be used to derive
-# cyb0rg project specific details, such as name, version, etc.
+# avatar project specific details, such as name, version, etc.
 # This should be sourced by middleware.
 #
 # Use easy-to parse lines for this script, like:
@@ -598,26 +598,26 @@
 # to invoke /bin/sh.
 
 # The name of the project, e.g. FreeNAS.
-CYB0RG_PROJECT="$NANO_NAME"
+AVATAR_PROJECT="$NANO_NAME"
 
 # The version of software, e.g. 8.0.3-RELEASE, 8.2-ALPHA, etc.
-CYB0RG_VERSION="$VERSION"
+AVATAR_VERSION="$VERSION"
 
 # The build number, e.g. r9310, <git-sha256-hash>, etc.
-CYB0RG_BUILD_NUMBER="$REVISION"
+AVATAR_BUILD_NUMBER="$REVISION"
 
 # The machine[:processor] for the image with a humanized name,
 # e.g. 'x64', 'mips:mipsel', etc.
 #
 # Divine the machine architecture from the 
-export CYB0RG_ARCH
+export AVATAR_ARCH
 
-export CYB0RG_PROJECT CYB0RG_VERSION CYB0RG_BUILD_NUMBER
-export CYB0RG_ARCH
+export AVATAR_PROJECT AVATAR_VERSION AVATAR_BUILD_NUMBER
+export AVATAR_ARCH
 EOF
-	cp ${NANO_OBJ}/cyb0rg.conf ${NANO_WORLDDIR}/etc/cyb0rg.conf
+	cp ${NANO_OBJ}/avatar.conf ${NANO_WORLDDIR}/etc/avatar.conf
 }
-customize_cmd cyb0rg_config
+customize_cmd avatar_config
 
 freenas_custom()
 {
@@ -743,7 +743,7 @@
 
 		(
 
-		sh "$CYB0RG_ROOT/build/create_iso.sh"
+		sh "$AVATAR_ROOT/build/create_iso.sh"
 
 		) > "${cd_image_log}" 2>&1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9395
          http://freenas.svn.sourceforge.net/freenas/?rev=9395&view=rev
Author:   yaberauneya
Date:     2012-01-03 09:05:56 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Create the 8.0.3-RELEASE tag.

Added Paths:
-----------
    tags/8.0.3-RELEASE/


Property changes on: tags/8.0.3-RELEASE
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/8.1:6033-6383
/branches/feedback:6189-6347
/experimental/ix-8.2:5657-5682
/tags/8.0.3-BETA2:9099-9100
/trunk:7248,7255,7262,7349-7361,7363,7371,7375,7381,7383,7385-7392,7395,7398,7402-7405,7418,7426,7440,7444,7448,7450,7452,7454,7463,7472,7491,7511,7520,7531-7534,7546,7568,7603,7608,7622,7633,7641,7649,7733,7833-7858,7909,7940-7941,7952-7954,7957,7982-7983,8003-8004,8049,8052,8093,8095,8097-8099,8103,8105,8126,8147-8148,8172-8173,8176,8185,8196,8198-8199,8242,8263,8284,8298,8302,8375,8380,8447-8452,8470-8471,8473,8497,8499,8507-8508,8513,8563,8581,8587,8592,8599,8636,8666,8675,8687,8701,8707-8708,8719,8746,8755,8778,8795,8826,8890-8891,8928-8929,8931,8957,8962,8965,8967,8986,8994,9003,9031-9032,9039,9046,9084,9157,9244,9246,9284,9325,9329-9330,9332,9336-9337,9357

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9394
          http://freenas.svn.sourceforge.net/freenas/?rev=9394&view=rev
Author:   yaberauneya
Date:     2012-01-03 09:04:43 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Rebrand this as 8.0.3-RELEASE given that the RC3 has been positively received by other users (joeschmuck, protosd, etc), and there isn't any additional feedback on the forums that I've seen to suggest that anything has regressed from 8.0.2-RELEASE-p2.

Modified Paths:
--------------
    branches/8.0.3/build/create_iso.sh
    branches/8.0.3/build/files/install.sh
    branches/8.0.3/nanobsd/freenas-common

Modified: branches/8.0.3/build/create_iso.sh
===================================================================
--- branches/8.0.3/build/create_iso.sh	2012-01-03 08:49:32 UTC (rev 9393)
+++ branches/8.0.3/build/create_iso.sh	2012-01-03 09:04:43 UTC (rev 9394)
@@ -29,7 +29,7 @@
 
     export FREENAS_ARCH
     export NANO_OBJ=${root}/obj.${FREENAS_ARCH}
-    REVISION="8.0.3-RC3"
+    REVISION="8.0.3-RELEASE"
     export NANO_NAME="FreeNAS-${REVISION}-${NANO_ARCH_HUMANIZED}"
     export NANO_IMGNAME="$NANO_NAME"
 

Modified: branches/8.0.3/build/files/install.sh
===================================================================
--- branches/8.0.3/build/files/install.sh	2012-01-03 08:49:32 UTC (rev 9393)
+++ branches/8.0.3/build/files/install.sh	2012-01-03 09:04:43 UTC (rev 9394)
@@ -321,7 +321,7 @@
 
     while :; do
 
-        dialog --clear --title "FreeNAS 8.0.3-RC3 Console Setup" --menu "" 12 73 6 \
+        dialog --clear --title "FreeNAS 8.0.3-RELEASE Console Setup" --menu "" 12 73 6 \
             "1" "Install/Upgrade to hard drive/flash device, etc." \
             "2" "Shell" \
             "3" "Reboot System" \

Modified: branches/8.0.3/nanobsd/freenas-common
===================================================================
--- branches/8.0.3/nanobsd/freenas-common	2012-01-03 08:49:32 UTC (rev 9393)
+++ branches/8.0.3/nanobsd/freenas-common	2012-01-03 09:04:43 UTC (rev 9394)
@@ -55,7 +55,7 @@
 # us to kleep the SVN revision number even when the version string is
 # overloaded with a name.
 : ${SVNREVISION=`svnversion ${NANO_CFG_BASE}`}
-REVISION="8.0.3-RC3"
+REVISION="8.0.3-RELEASE"
 NANO_NAME="FreeNAS-${REVISION}-${NANO_ARCH_HUMANIZED}"
 NANO_IMGNAME="${NANO_NAME}"
 NANO_KERNEL=${NANO_CFG_BASE}/FREENAS.${NANO_ARCH}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9393
          http://freenas.svn.sourceforge.net/freenas/?rev=9393&view=rev
Author:   yaberauneya
Date:     2012-01-03 08:49:32 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Add in the needed multimedia goo from trunk. Rebrand as 8.0.3-RELEASE_MULTIMEDIA.

Modified Paths:
--------------
    branches/8.0.3-mm/build/create_iso.sh
    branches/8.0.3-mm/build/files/install.sh
    branches/8.0.3-mm/nanobsd/freenas-common

Modified: branches/8.0.3-mm/build/create_iso.sh
===================================================================
--- branches/8.0.3-mm/build/create_iso.sh	2012-01-03 06:21:15 UTC (rev 9392)
+++ branches/8.0.3-mm/build/create_iso.sh	2012-01-03 08:49:32 UTC (rev 9393)
@@ -29,7 +29,7 @@
 
     export FREENAS_ARCH
     export NANO_OBJ=${root}/obj.${FREENAS_ARCH}
-    REVISION="8.0.3-RC3"
+    REVISION="8.0.3-RELEASE_MULTIMEDIA"
     export NANO_NAME="FreeNAS-${REVISION}-${NANO_ARCH_HUMANIZED}"
     export NANO_IMGNAME="$NANO_NAME"
 

Modified: branches/8.0.3-mm/build/files/install.sh
===================================================================
--- branches/8.0.3-mm/build/files/install.sh	2012-01-03 06:21:15 UTC (rev 9392)
+++ branches/8.0.3-mm/build/files/install.sh	2012-01-03 08:49:32 UTC (rev 9393)
@@ -321,7 +321,7 @@
 
     while :; do
 
-        dialog --clear --title "FreeNAS 8.0.3-RC3 Console Setup" --menu "" 12 73 6 \
+        dialog --clear --title "FreeNAS 8.0.3-RELEASE_MULTIMEDIA Console Setup" --menu "" 12 73 6 \
             "1" "Install/Upgrade to hard drive/flash device, etc." \
             "2" "Shell" \
             "3" "Reboot System" \

Modified: branches/8.0.3-mm/nanobsd/freenas-common
===================================================================
--- branches/8.0.3-mm/nanobsd/freenas-common	2012-01-03 06:21:15 UTC (rev 9392)
+++ branches/8.0.3-mm/nanobsd/freenas-common	2012-01-03 08:49:32 UTC (rev 9393)
@@ -55,7 +55,7 @@
 # us to kleep the SVN revision number even when the version string is
 # overloaded with a name.
 : ${SVNREVISION=`svnversion ${NANO_CFG_BASE}`}
-REVISION="8.0.3-RC3"
+REVISION="8.0.3-RELEASE_MULTIMEDIA"
 NANO_NAME="FreeNAS-${REVISION}-${NANO_ARCH_HUMANIZED}"
 NANO_IMGNAME="${NANO_NAME}"
 NANO_KERNEL=${NANO_CFG_BASE}/FREENAS.${NANO_ARCH}
@@ -64,6 +64,8 @@
 NANO_BOOT0CFG="-o packet -s 1 -m 3 -t 18"
 
 DEBUG="0"
+MULTIMEDIA="1"
+REPORTING="1"
 
 # /var -> ~150MB (look through rc.initdiskless for the formula of how this
 # number is calculated out).
@@ -82,21 +84,15 @@
 
 . ${NANO_CFG_BASE}/common
 
+add_port converters/libiconv
+add_port converters/iconv
+add_port devel/gettext
 add_port devel/pkg-config
-add_port x11/kbproto
-add_port x11/xproto WITHOUT_X11=y
-add_port x11/libXdmcp WITHOUT_X11=y
-add_port x11/libXau WITHOUT_X11=y
 add_port devel/libpthread-stubs WITHOUT_X11=y
-add_port x11/libxcb WITHOUT_X11=y
-add_port x11/libX11
 add_port devel/cdialog
 add_port dns/inadyn			# -mt?
 #+editors/nano
 add_port lang/perl5.12
-add_port converters/libiconv
-add_port converters/iconv
-add_port devel/gettext
 #-editors/nano
 add_port editors/nano
 add_port ftp/proftpd
@@ -169,52 +165,67 @@
 add_port net-mgmt/net-snmp
 add_port sysutils/nut -DWITHOUT_NEON
 
-add_port devel/libstatgrab -DWITHOUT_X11 # run dep of collectd
-add_port devel/libltdl -DWITHOUT_X11 # run dep of collectd
-add_port print/freetype2 -DWITHOUT_X11 # run dep of collectd
-add_port textproc/expat2 -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/fontconfig -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/libfontenc -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/mkfontscale -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/mkfontdir -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/font-bh-ttf -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/font-misc-meltho -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/font-misc-ethiopic -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/bitstream-vera -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/font-util -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/encodings -DWITHOUT_X11 # run dep of collectd
-add_port x11-fonts/xorg-fonts-truetype -DWITHOUT_X11 # run dep of collectd
-add_port x11/xcb-util -DWITHOUT_X11 # run dep of collectd
+add_port textproc/libxml2 WITHOUT_X11=y
+add_port textproc/py-libxml2 WITHOUT_X11=y
+
+add_port textproc/expat2 WITHOUT_X11=y
+add_port devel/gamin WITHOUT_X11=y
+add_port devel/gio-fam-backend WITHOUT_X11=y
+add_port devel/m4 WITHOUT_X11=y
+add_port devel/bison WITHOUT_X11=y
+add_port devel/libffi WITHOUT_X11=y
+add_port devel/gobject-introspection
+
+if [ "${REPORTING}" = 1 -o "${MULTIMEDIA}" = 1 ]; then
+add_port graphics/png WITHOUT_X11=y
+fi
+
+if [ "${REPORTING}" = 1 ]; then
+#+add_port net-mgmt/collectd
+add_port devel/libstatgrab WITHOUT_X11=y
+add_port devel/libltdl WITHOUT_X11=y
+add_port print/freetype2 WITHOUT_X11=y
+add_port x11/kbproto
+add_port x11/xproto WITHOUT_X11=y
+add_port x11/libXdmcp WITHOUT_X11=y
+add_port x11/libXau WITHOUT_X11=y
+add_port x11/libxcb WITHOUT_X11=y
+add_port x11/libX11
+add_port x11-fonts/fontconfig WITHOUT_X11=y
+add_port x11-fonts/libfontenc WITHOUT_X11=y
+add_port x11-fonts/mkfontscale WITHOUT_X11=y
+add_port x11-fonts/mkfontdir WITHOUT_X11=y
+add_port x11-fonts/font-bh-ttf WITHOUT_X11=y
+add_port x11-fonts/font-misc-meltho WITHOUT_X11=y
+add_port x11-fonts/font-misc-ethiopic WITHOUT_X11=y
+add_port x11-fonts/bitstream-vera WITHOUT_X11=y
+add_port x11-fonts/font-util WITHOUT_X11=y
+add_port x11-fonts/encodings WITHOUT_X11=y
+add_port x11-fonts/xorg-fonts-truetype WITHOUT_X11=y
+add_port x11/xcb-util WITHOUT_X11=y
 add_port x11/libXrender
 add_port x11/renderproto
-add_port x11/xcb-proto -DWITHOUT_X11 # run dep of collectd
-add_port devel/gamin -DWITHOUT_X11 # run dep of collectd
-add_port devel/gio-fam-backend -DWITHOUT_X11 # run dep of collectd
-add_port x11/pixman -DWITHOUT_X11 # run dep of collectd
-add_port graphics/png -DWITHOUT_X11 # run dep of collectd
-add_port graphics/cairo -DWITHOUT_X11 # run dep of collectd
-add_port devel/m4 -DWITHOUT_X11 # run dep of collectd
-add_port devel/bison -DWITHOUT_X11 # run dep of collectd
-add_port devel/libffi -DWITHOUT_X11 # run dep of collectd
-add_port x11-toolkits/pango -DWITHOUT_X11 # run dep of collectd
-add_port textproc/libxml2 -DWITHOUT_X11 # run dep of collectd
-add_port textproc/py-libxml2 -DWITHOUT_X11 # run dep of collectd
-add_port databases/rrdtool -DWITHOUT_X11 -DWITHOUT_PERL_MODULE -DWITH_PYTHON_MODULE # run dep of collectd
-add_port devel/gobject-introspection -DWITHOUT_X11 # run dep of collectd
-add_port net/liboping -DWITHOUT_X11 # run dep of collectd
-add_port net-mgmt/collectd -DWITHOUT_BIND -DWITHOUT_SNMP -DWITHOUT_X11
+add_port x11/xcb-proto WITHOUT_X11=y
+add_port x11/pixman WITHOUT_X11=y
+add_port graphics/png WITHOUT_X11=y
+add_port graphics/cairo WITHOUT_X11=y
+add_port x11-toolkits/pango WITHOUT_X11=y
+add_port databases/rrdtool	WITHOUT_X11=y WITHOUT_PERL_MODULE=y \
+				WITH_PYTHON_MODULE=y
+add_port net/liboping WITHOUT_X11=y
+#-add_port net-mgmt/collectd
+add_port net-mgmt/collectd WITHOUT_BIND=y WITHOUT_SNMP=y WITHOUT_X11=y
+fi
 add_port devel/py-ipaddr
 add_port converters/base64
-add_port emulators/mtools -DWITHOUT_X11
+add_port emulators/mtools WITHOUT_X11=y
 add_port sysutils/arcconf
 add_port sysutils/tw_cli
 add_port net/py-ldap2 -DWITH_SASL
 add_port sysutils/ataidle
-add_port devel/xorg-macros
 add_port sysutils/gnome_subr
-add_port x11/libX11
-add_port devel/dbus
-add_port devel/dbus-glib
+add_port devel/dbus WITHOUT_X11=y
+add_port devel/dbus-glib WITHOUT_X11=y
 add_port devel/libdaemon
 add_port databases/gdbm
 add_port net/avahi-app
@@ -233,6 +244,63 @@
 add_port benchmarks/iperf
 add_port sysutils/ipmitool
 
+if [ "${DEBUG}" = 1 -o "${MULTIMEDIA}" = 1 ]; then
+	#+add_port devel/git || net-p2p/transmission-daemon
+	add_port security/ca_root_nss WITH_ETCSYMLINK=y
+	add_port ftp/curl
+	#-add_port devel/git || net-p2p/transmission-daemon
+fi
+
+if [ "${MULTIMEDIA}" = 1 ]; then
+	#+add_port audio/firefly || net/minidlna
+	#add_port graphics/png WITHOUT_APNG=y
+	#add_port devel/pkg-config
+	add_port audio/libid3tag
+	add_port audio/libogg
+	add_port audio/libvorbis
+	add_port audio/speex
+	#-add_port audio/firefly || net/minidlna
+	add_port audio/libao
+	add_port audio/vorbis-tools
+	add_port multimedia/libkate
+	#add_port databases/sqlite3
+	#-add_port audio/firefly || net/minidlna
+	#+add_port net/minidlna
+	#add_port converters/libiconv
+	add_port multimedia/mp4v2
+	add_port audio/faac
+	add_port audio/flac
+	add_port audio/lame
+	#add_port databases/sqlite3
+	add_port graphics/jpeg
+	#add_port devel/gettext
+	add_port graphics/libexif
+	add_port audio/opencore-amr
+	add_port graphics/opencv-core
+	add_port multimedia/libtheora
+	#add_port devel/yasm ?
+	#add_port lang/perl5.12
+	#add_port shells/bash
+	add_port devel/orc
+	add_port multimedia/schroedinger
+	add_port multimedia/gpac-libgpac WITHOUT_OPENGL=y
+	add_port multimedia/x264 WITHOUT_ASM=y
+	add_port multimedia/xvid WITHOUT_OPTIMIZED_CFLAGS=y
+	#add_port multimedia/libvpx
+	add_port multimedia/ffmpeg	WITH_FAAC=y WITH_LAME=y WITH_SPEEX=y \
+					WITHOUT_FFSERVER=y WITHOUT_FREETYPE=y \
+					WITHOUT_VP8=y
+	#-add_port net/minidlna
+	add_port audio/firefly
+	add_port net/minidlna
+	#+add_port net-p2p/transmission-daemon
+	#add_port devel/pkg-config
+	add_port devel/libevent2
+	add_port www/transmission-web
+	#-add_port net-p2p/transmission-daemon
+	add_port net-p2p/transmission-daemon
+fi
+
 if [ "${DEBUG}" -eq "1" ]; then 
 	add_port databases/db42
 	add_port devel/apr1
@@ -244,7 +312,6 @@
 	add_port editors/vim-lite
 	add_port misc/py-pexpect
 	add_port devel/ipython
-	add_port ftp/curl
 	add_port devel/p5-Term-ReadKey
 	add_port devel/p5-subversion
 	add_port mail/p5-Net-SMTP-SSL

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9390
          http://freenas.svn.sourceforge.net/freenas/?rev=9390&view=rev
Author:   yaberauneya
Date:     2012-01-03 03:56:52 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Remove always False case, and refactor to be slightly more optimal.

Modified Paths:
--------------
    trunk/gui/middleware/notifier.py

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2012-01-02 23:49:16 UTC (rev 9389)
+++ trunk/gui/middleware/notifier.py	2012-01-03 03:56:52 UTC (rev 9390)
@@ -2425,11 +2425,11 @@
 
             if dskname not in disks:
                 disk.disk_enabled = False
-                if not (disk.disk_enabled or disk._original_state.get("disk_enabled")):
+                if disk._original_state.get("disk_enabled"):
                     #Duplicated disk entries in database
+                    disk.save()
+                else:
                     disk.delete()
-                else:
-                    disk.save()
             else:
                 disk.save()
             in_disks[dskname] = disk

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.