freenas | 25 Oct 02:20 2014

[freenas/freenas] bc464b6: Increase the height of the update datagrid

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit bc464b6e8821c8941f0ff9fe28637d256c85c56c
Author: William Grzybowski <wg@...>
Date:   Fri Oct 24 17:19:55 2014 -0700

    Increase the height of the update datagrid

    Ticket:	#6395
---
 gui/freeadmin/static/css/custom.css             | 4 ++++
 gui/freeadmin/static/lib/js/freeadmin/Update.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gui/freeadmin/static/css/custom.css b/gui/freeadmin/static/css/custom.css
index 73bcb5b..29e98ed 100755
--- a/gui/freeadmin/static/css/custom.css
+++ b/gui/freeadmin/static/css/custom.css
 <at>  <at>  -1409,6 +1409,10  <at>  <at>  table.layoutTable > tr:first-child > td {
     height: 100px !important;
 }

+.dgrid-update {
+    height: 150px !important;
+}
+
 table.update > tbody > tr > td {
     padding: 5px;
(Continue reading)

freenas | 25 Oct 02:01 2014

[freenas/freenas] 9d2f53b: A whole slew of changes related to signing.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 9d2f53b68a27fc0b7ed29451d5183b8d353507fe
Author: Sean Fagan <sef@...>
Date:   Fri Oct 24 17:00:38 2014 -0700

    A whole slew of changes related to signing.

    Note that signing and verification DO NOT WORK yet.
    This is mainly to get the framework in.  Also get the
    key files distributed.  From this, I can start doing
    more real testing.  Also I don't have to worry so much
    about losing my changes.
---
 build/nanobsd/nanobsd.sh                           |   7 +-
 src/freenas-pkgtools/Makefile                      |   9 +-
 src/freenas-pkgtools/Makefile.inc                  |   2 +-
 src/freenas-pkgtools/certificates/Makefile         |  12 +
 .../certificates/freenas-update.pem                | 106 ++++
 src/freenas-pkgtools/certificates/iX-CA.pem        |  33 ++
 src/freenas-pkgtools/files/pkg-plist               |   3 +
 .../freenas-install/freenas-install.py             |   6 +-
 src/freenas-pkgtools/lib/Makefile                  |   3 +-
 src/freenas-pkgtools/lib/Manifest.py               |  67 ++-
 src/freenas-pkgtools/lib/__init__.py               |   6 +
 .../manifest_util/manifest_util.py                 |  58 ++-
 src/freenas-pkgtools/verify_signature/Makefile     |  11 +
 .../verify_signature/verify_signature.c            | 551 +++++++++++++++++++++
(Continue reading)

freenas | 25 Oct 00:09 2014

[freenas/freenas] 5572d8e: Merge remote-tracking branch 'origin/master' into freebsd10

branch: freebsd10
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freebsd10
commit 5572d8e090048a7970fae7c31486fa2de241708a
Merge: b84b52d fcb1a27
Author: Jordan Hubbard <jkh@...>
Date:   Fri Oct 24 15:09:15 2014 -0700

    Merge remote-tracking branch 'origin/master' into freebsd10

 src/freenas-pkgtools/lib/Configuration.py | 51 +++----------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)
freenas | 24 Oct 21:05 2014

[freenas/freenas] fcb1a27: Be a bit better about logging data as it's read.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit fcb1a2728d2f44d7905e1531420fa8363fd36101
Author: Sean Fagan <sef@...>
Date:   Fri Oct 24 12:05:29 2014 -0700

    Be a bit better about logging data as it's read.
---
 src/freenas-pkgtools/lib/Configuration.py | 51 +++----------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

diff --git a/src/freenas-pkgtools/lib/Configuration.py b/src/freenas-pkgtools/lib/Configuration.py
index d7f894a..c542344 100644
--- a/src/freenas-pkgtools/lib/Configuration.py
+++ b/src/freenas-pkgtools/lib/Configuration.py
 <at>  <at>  -56,51 +56,6  <at>  <at>  def TryOpenFile(path):
     else:
         return f

-def TryGetNetworkFile(url, tmp, current_version="1", handler=None):
-    raise Exception("Obsolete")
-    AVATAR_VERSION = "X-%s-Manifest-Version" % Avatar()
-    try:
-        req = urllib2.Request(url)
-        req.add_header(AVATAR_VERSION, current_version)
-        # Hack for debugging
-        req.add_header("User-Agent", "%s=%s" % (AVATAR_VERSION, current_version))
-        furl = urllib2.urlopen(req, timeout=5)
(Continue reading)

freenas | 24 Oct 19:24 2014

[freenas/freenas] b84b52d: Merge remote-tracking branch 'origin/master' into freebsd10

branch: freebsd10
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freebsd10
commit b84b52d82f3cb61db6de3d432a8d5d189b666674
Merge: 03d6569 7ab0dd7
Author: Jordan Hubbard <jkh@...>
Date:   Fri Oct 24 10:24:28 2014 -0700

    Merge remote-tracking branch 'origin/master' into freebsd10

 build/nanobsd-cfg/Files/etc/devd/sync.conf         |   4 +-
 build/nanobsd-cfg/os-ports                         |   2 +-
 gui/freeadmin/static/lib/js/freeadmin.js           |  37 +-
 gui/middleware/notifier.py                         | 198 ++---------
 gui/services/forms.py                              | 175 +++++-----
 .../0151_auto__add_field_webdav_webdav_certssl.py  | 384 +++++++++++++++++++++
 gui/services/models.py                             |  80 +++--
 nas_ports/freenas/freenas-files/Makefile           |   1 +
 nas_ports/freenas/freenas-files/pkg-plist          |   1 +
 src/freenas-pkgtools/lib/Manifest.py               |   2 +-
 src/freenas-pkgtools/lib/Update.py                 |   1 +
 src/freenas/etc/ix.rc.d/ix-apache                  |  17 +-
 src/freenas/etc/ix.rc.d/ix-fstab                   |  17 -
 src/freenas/etc/ix.rc.d/ix-nsswitch                |   4 +-
 src/freenas/etc/ix.rc.d/ix-swap                    |  37 ++
 .../usr/local/libexec/nas/generate_webdav_conf.py  | 170 +++++++++
 16 files changed, 782 insertions(+), 348 deletions(-)
freenas | 24 Oct 09:50 2014

[freenas/freenas] 7ab0dd7: Linking the new Cert Ui to WebDAV, making WebDAV code efficient, doing some clean up.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 7ab0dd7b9cf980d72fd8fc1731d8962b2f9a2ea5
Author: Suraj Ravichandran <suraj@...>
Date:   Fri Oct 24 00:48:16 2014 -0700

    Linking the new Cert Ui to WebDAV, making WebDAV code efficient, doing some clean up.

    Actually, lots of clean-up (I basically saw my own code from 2 months ago and said "yuck!")

    So I revamped almost all of it (lets see what happens 2 months from now :-) )

    I have managed to meesup the javascript and some other minor (non-service interruptive)  stuff though.

    Will work out how to fix them, in the next commit.
---
 build/nanobsd-cfg/os-ports                         |   2 +-
 gui/freeadmin/static/lib/js/freeadmin.js           |  37 +-
 gui/middleware/notifier.py                         | 182 +---------
 gui/services/forms.py                              | 175 +++++-----
 .../0151_auto__add_field_webdav_webdav_certssl.py  | 384 +++++++++++++++++++++
 gui/services/models.py                             |  80 +++--
 src/freenas/etc/ix.rc.d/ix-apache                  |  17 +-
 .../usr/local/libexec/nas/generate_webdav_conf.py  | 170 +++++++++
 8 files changed, 725 insertions(+), 322 deletions(-)

diff --git a/build/nanobsd-cfg/os-ports b/build/nanobsd-cfg/os-ports
index ac6f300..f27e937 100755
(Continue reading)

freenas | 24 Oct 04:17 2014

[freenas/freenas] 7f9de2d: Fix a reference-before-assignment that happened to to an exception.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 7f9de2d16114300e70e7ec77a416eeaba83698c6
Author: Sean Fagan <sef@...>
Date:   Thu Oct 23 19:17:01 2014 -0700

    Fix a reference-before-assignment that happened to to an exception.
---
 src/freenas-pkgtools/lib/Update.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/freenas-pkgtools/lib/Update.py b/src/freenas-pkgtools/lib/Update.py
index 7f06908..5c85492 100644
--- a/src/freenas-pkgtools/lib/Update.py
+++ b/src/freenas-pkgtools/lib/Update.py
 <at>  <at>  -325,6 +325,7  <at>  <at>  def Update(root=None, conf=None, train = None, check_handler=None, get_handler=N
     # environment.  (If the caller wants to install into the
     # current boot environment, set root = "" or "/".)
     clone_name = None
+    mount_point = None
     try:
         if root is None:
             # We clone the existing boot environment to
freenas | 24 Oct 03:38 2014

[freenas/freenas] bda25f2: Thinko, used wrong variable.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit bda25f25ad6c2d2c07f82f1097de647a1d8bf93d
Author: Sean Fagan <sef@...>
Date:   Thu Oct 23 18:38:33 2014 -0700

    Thinko, used wrong variable.
---
 src/freenas-pkgtools/lib/Manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freenas-pkgtools/lib/Manifest.py b/src/freenas-pkgtools/lib/Manifest.py
index 8b1e501..eec70a6 100644
--- a/src/freenas-pkgtools/lib/Manifest.py
+++ b/src/freenas-pkgtools/lib/Manifest.py
 <at>  <at>  -315,7 +315,7  <at>  <at>  class Manifest(object):
         return

     def SignWithKey(self, key_data):
-        if key is None:
+        if key_data is None:
             # We'll cheat, and say this means "get rid of the signature"
             self._signature = None
         else:
freenas | 24 Oct 02:40 2014

[freenas/freenas] 72e5439: Defer attaching swap until ZFS volumes are mounted.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 72e543910136e77704e0a89921d6ad7e0e202264
Author: Jakub Klama <jakub@...>
Date:   Fri Oct 24 02:45:23 2014 +0200

    Defer attaching swap until ZFS volumes are mounted.

    With that change, swap partitions are attached after ZFS layer
    is fully initialized and ZFS volumes are mounted, so we can figure
    out which ZFS volumes are used (attached) and should have active
    swap partitions.

    Ticket:	#3685
---
 gui/middleware/notifier.py                | 16 +++++++++----
 nas_ports/freenas/freenas-files/Makefile  |  1 +
 nas_ports/freenas/freenas-files/pkg-plist |  1 +
 src/freenas/etc/ix.rc.d/ix-fstab          | 17 --------------
 src/freenas/etc/ix.rc.d/ix-swap           | 37 +++++++++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/gui/middleware/notifier.py b/gui/middleware/notifier.py
index 75fe73e..946b876 100755
--- a/gui/middleware/notifier.py
+++ b/gui/middleware/notifier.py
 <at>  <at>  -2205,6 +2205,7  <at>  <at>  class notifier:

(Continue reading)

freenas | 24 Oct 00:42 2014

[freenas/freenas] 7324afa: Fix missing shared library errors when launching notifier.py before ldconfig.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 7324afa1713d9e76f7cabede8667eb86264304c7
Author: Jakub Klama <jakub@...>
Date:   Fri Oct 24 00:45:05 2014 +0200

    Fix missing shared library errors when launching notifier.py before ldconfig.

    Ticket:	#6426
---
 build/nanobsd-cfg/Files/etc/devd/sync.conf | 4 ++--
 src/freenas/etc/ix.rc.d/ix-nsswitch        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/nanobsd-cfg/Files/etc/devd/sync.conf b/build/nanobsd-cfg/Files/etc/devd/sync.conf
index 192ddc1..be76ff6 100644
--- a/build/nanobsd-cfg/Files/etc/devd/sync.conf
+++ b/build/nanobsd-cfg/Files/etc/devd/sync.conf
 <at>  <at>  -2,12 +2,12  <at>  <at>  notify 20 {
         match "system" "DEVFS";
         match "type" "CREATE";
         match "cdev" "a?da[0-9]+$";
-        action "/usr/local/bin/python /usr/local/www/freenasUI/tools/sync_disks.py $cdev";
+        action "LD_LIBRARY_PATH=/usr/local/lib /usr/local/bin/python
/usr/local/www/freenasUI/tools/sync_disks.py $cdev";
 };

 notify 20 {
(Continue reading)

freenas | 23 Oct 20:05 2014

[freenas/freenas] 03d6569: Merge remote-tracking branch 'origin/master' into freebsd10

branch: freebsd10
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freebsd10
commit 03d6569c4cb0327aba8d7a85b85575873beaefa4
Merge: 013ffbe 15edc49
Author: Jordan Hubbard <jkh@...>
Date:   Thu Oct 23 11:05:43 2014 -0700

    Merge remote-tracking branch 'origin/master' into freebsd10

 gui/system/alertmods/update_check.py |  2 +-
 gui/system/views.py                  | 65 +++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 32 deletions(-)

Gmane