freenas | 18 Apr 20:32 2015

[freenas/freenas] 623065f: Merge branch 'freenas10/feature/build-system' into freenas10/development

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit 623065f7063b74cd05b98e28c9bef824df908f7d
Merge: 199cf19 1e097d7
Author: Jakub Klama <jakub@...>
Date:   Sat Apr 18 20:29:50 2015 +0200

    Merge branch 'freenas10/feature/build-system' into freenas10/development

 Makefile                                           |  128 ++-
 build/Templates/base-os/+POST_UPGRADE              |    2 -
 build/Templates/base-os/+PRE_UPGRADE               |    1 -
 build/build_cleanup.py                             |   52 -
 build/build_jail.sh                                |   57 --
 build/check_build_host.sh                          |   88 --
 build/check_sandbox.sh                             |   46 -
 build/config/config.pyd                            |  102 ++
 build/config/env.pyd                               |   75 ++
 .../backend/installimage.sh => config/jail.pyd}    |   30 +-
 build/{nanobsd-cfg => config/kernel}/DEBUG         |    0
 build/{nanobsd-cfg => config/kernel}/FREENAS.amd64 |    0
 build/{nanobsd-cfg => config/kernel}/FREENAS.i386  |    0
 .../root/change_password => config/packages.pyd}   |   34 +-
 build/config/ports-freenas.pyd                     |  141 +++
 .../save_sshkeys => config/ports-installer.pyd}    |   41 +-
 build/config/ports-system.pyd                      |  328 ++++++
 .../backend-query/sys-mem.sh => config/ports.pyd}  |   11 +-
 .../Files/root/save_cfg => config/release.pyd}     |   30 +-
(Continue reading)

freenas | 18 Apr 20:29 2015

[freenas/freenas] 1e097d7: Remove unused DSL entry; style fix.

branch: freenas10/feature/build-system
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/feature/build-system
commit 1e097d78f903c27cbba45e2e3bb92b03c2648b1f
Author: Jakub Klama <jakub@...>
Date:   Sat Apr 18 20:29:03 2015 +0200

    Remove unused DSL entry; style fix.

    Ticket: #9041
---
 build/config/ports-freenas.pyd | 10 ----------
 build/tools/build-ports.py     |  3 +--
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/build/config/ports-freenas.pyd b/build/config/ports-freenas.pyd
index 78e7225..6e8a58b 100644
--- a/build/config/ports-freenas.pyd
+++ b/build/config/ports-freenas.pyd
 <at>  <at>  -139,13 +139,3  <at>  <at>  port(
         e("REVISION=${GIT_REVISION}")
     ]
 )
-
-if PRODUCT != "TrueNAS":
-    port(
-        name="freenas/py-fnutils",
-        options=[
-            e("PRODUCT_VERSION=${VERSION}"),
(Continue reading)

freenas | 18 Apr 20:27 2015

[freenas/freenas] 12a84f3: Fix creating and removing temporary directories on clean build.

branch: freenas10/feature/build-system
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/feature/build-system
commit 12a84f38962875afa9f33cae466a20d45a3d0829
Author: Jakub Klama <jakub@...>
Date:   Sat Apr 18 11:26:07 2015 -0700

    Fix creating and removing temporary directories on clean build.

    Ticket: #9041
---
 build/tools/create-iso.py    | 6 ++++--
 build/tools/install-jail.py  | 7 ++++++-
 build/tools/install-world.py | 9 ++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/build/tools/create-iso.py b/build/tools/create-iso.py
index aa8c26c..9d2eac4 100755
--- a/build/tools/create-iso.py
+++ b/build/tools/create-iso.py
 <at>  <at>  -219,8 +219,10  <at>  <at>  def setup_diskless():

 def cleandirs():
     info('Cleaning previous build products')
-    sh('chflags -R 0 ${INSTUFS_DESTDIR}')
-    sh('rm -rf ${INSTUFS_DESTDIR}')
+    if os.path.isdir(e('${INSTUFS_DESTDIR}')):
+        sh('chflags -R 0 ${INSTUFS_DESTDIR}')
+        sh('rm -rf ${INSTUFS_DESTDIR}')
(Continue reading)

freenas | 18 Apr 12:40 2015

[freenas/freenas] dbecd16: There's not atacontrol in 10.

branch: freenas10/feature/build-system
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/feature/build-system
commit dbecd1661e16a6c70d177c7aff981b4fad05b9da
Author: Jakub Klama <jakub@...>
Date:   Sat Apr 18 03:39:50 2015 -0700

    There's not atacontrol in 10.

    Ticket: #9041
---
 build/tools/create-iso.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/tools/create-iso.py b/build/tools/create-iso.py
index dca0e75..aa8c26c 100755
--- a/build/tools/create-iso.py
+++ b/build/tools/create-iso.py
 <at>  <at>  -44,7 +44,6  <at>  <at>  output = objdir('${NAME}.iso')

 symlinks = {
     '[': '/bin/[',
-    'atacontrol': '/sbin/atacontrol',
     'badsect': '/sbin/badsect',
     'bsdlabel': '/sbin/bsdlabel',
     'bunzip2': '/usr/bin/bunzip2',
 <at>  <at>  -338,4 +337,4  <at>  <at>  if __name__ == '__main__':
     clean_iso_image()
     create_iso_dirs()
(Continue reading)

freenas | 18 Apr 12:39 2015

[freenas/freenas] a73ed67: Move GUI upgrade script to src/

branch: freenas10/feature/build-system
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/feature/build-system
commit a73ed67afe798c187abf34d4dfa319136c70be80
Author: Jakub Klama <jakub@...>
Date:   Sat Apr 18 12:39:26 2015 +0200

    Move GUI upgrade script to src/

    Ticket: #9041
---
 src/freenas-gui-upgrade/install/0200.run_update.sh | 269 +++++++++++++++++++++
 1 file changed, 269 insertions(+)

diff --git a/src/freenas-gui-upgrade/install/0200.run_update.sh b/src/freenas-gui-upgrade/install/0200.run_update.sh
new file mode 100644
index 0000000..61f9ae9
--- /dev/null
+++ b/src/freenas-gui-upgrade/install/0200.run_update.sh
 <at>  <at>  -0,0 +1,269  <at>  <at> 
+#!/bin/sh
+#-
+# Copyright (c) 2014 iXsystems, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
(Continue reading)

freenas | 18 Apr 04:04 2015

[freenas/freenas] 199cf19: Make the UID and GID defaults actually work.

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit 199cf193f41a21df1a3f8e456ad4bf68917abdb1
Author: Ben Milman <bpmilman@...>
Date:   Fri Apr 17 18:28:10 2015 -0700

    Make the UID and GID defaults actually work.

    Ticket: #9278
---
 src/gui/app/jsx/components/mixins/groupMixins.jsx  | 21 +++++++++++++++++++--
 src/gui/app/jsx/components/mixins/userMixins.jsx   | 13 +++++++++++++
 src/gui/app/jsx/views/Accounts/Groups/AddGroup.jsx | 10 +++++++---
 src/gui/app/jsx/views/Accounts/Users/AddUser.jsx   | 19 ++++++++++++-------
 4 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/src/gui/app/jsx/components/mixins/groupMixins.jsx b/src/gui/app/jsx/components/mixins/groupMixins.jsx
index 8dba7a7..88c2dee 100644
--- a/src/gui/app/jsx/components/mixins/groupMixins.jsx
+++ b/src/gui/app/jsx/components/mixins/groupMixins.jsx
 <at>  <at>  -13,15 +13,32  <at>  <at>  var GroupsMiddleware = require("../../middleware/GroupsMiddleware");

 module.exports = {

+    componentDidMount: function(){
+      GroupsStore.addChangeListener(this.updateGroupsListInState);
+    }
+
(Continue reading)

freenas | 18 Apr 04:04 2015

[freenas/freenas] e8ef166: addEntity is now integrated into viewData.

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit e8ef166d0ce05ddc58eb85697f40783e1199fda9
Author: Ben Milman <bpmilman@...>
Date:   Fri Apr 17 18:23:50 2015 -0700

    addEntity is now integrated into viewData.
---
 src/gui/app/jsx/components/Viewer.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gui/app/jsx/components/Viewer.jsx b/src/gui/app/jsx/components/Viewer.jsx
index a302ccc..2d247dc 100644
--- a/src/gui/app/jsx/components/Viewer.jsx
+++ b/src/gui/app/jsx/components/Viewer.jsx
 <at>  <at>  -25,7 +25,6  <at>  <at>  var Viewer = React.createClass({
         defaultMode  : React.PropTypes.string
       , allowedModes : React.PropTypes.array
       , inputData    : React.PropTypes.array.isRequired
-      , addEntity    : React.PropTypes.string
       , viewData     : React.PropTypes.object.isRequired
       , displayData  : React.PropTypes.object
     }
 <at>  <at>  -275,7 +274,6  <at>  <at>  var Viewer = React.createClass({
       return <ViewerContent
                 viewData         = { this.props.viewData }
                 inputData        = { this.props.inputData }
-                addEntity        = { this.props.addEntity}
(Continue reading)

freenas | 18 Apr 04:04 2015

[freenas/freenas] 4803df9: Move context types out of the mixin. It was confusing me as to what did and didn't have it.

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit 4803df99e65ae272518fd2decde0365a84802256
Author: Ben Milman <bpmilman@...>
Date:   Fri Apr 17 16:59:01 2015 -0700

    Move context types out of the mixin. It was confusing me as to what did and didn't have it.
---
 src/gui/app/jsx/components/mixins/groupMixins.jsx   | 3 ---
 src/gui/app/jsx/views/Accounts/Groups/AddGroup.jsx  | 2 +-
 src/gui/app/jsx/views/Accounts/Groups/GroupItem.jsx | 4 ++++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gui/app/jsx/components/mixins/groupMixins.jsx b/src/gui/app/jsx/components/mixins/groupMixins.jsx
index e11d275..a67a4b9 100644
--- a/src/gui/app/jsx/components/mixins/groupMixins.jsx
+++ b/src/gui/app/jsx/components/mixins/groupMixins.jsx
 <at>  <at>  -14,9 +14,6  <at>  <at>  var GroupsMiddleware = require("../../middleware/GroupsMiddleware");

 module.exports = {

-    contextTypes: {
-        router: React.PropTypes.func
-    }

     // Will return the first available GID above 1000 (to be used as a default).
   , getNextGID: function() {
diff --git a/src/gui/app/jsx/views/Accounts/Groups/AddGroup.jsx b/src/gui/app/jsx/views/Accounts/Groups/AddGroup.jsx
(Continue reading)

freenas | 18 Apr 04:04 2015

[freenas/freenas] 8d6369a: Various style and unused require cleanup.

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit 8d6369ada92cbe0d8b3edf4fad652a45d3e4e717
Author: Ben Milman <bpmilman@...>
Date:   Fri Apr 17 17:45:48 2015 -0700

    Various style and unused require cleanup.
---
 src/gui/app/jsx/components/mixins/groupMixins.jsx   | 1 -
 src/gui/app/jsx/stores/GroupsStore.js               | 8 ++++----
 src/gui/app/jsx/views/Accounts/Groups/GroupItem.jsx | 1 -
 src/gui/app/jsx/views/Accounts/Users/UserItem.jsx   | 8 ++++----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/gui/app/jsx/components/mixins/groupMixins.jsx b/src/gui/app/jsx/components/mixins/groupMixins.jsx
index a67a4b9..8dba7a7 100644
--- a/src/gui/app/jsx/components/mixins/groupMixins.jsx
+++ b/src/gui/app/jsx/components/mixins/groupMixins.jsx
 <at>  <at>  -7,7 +7,6  <at>  <at> 
 "use strict";

 var _     = require("lodash");
-var React = require("react");

 var GroupsStore      = require("../../stores/GroupsStore");
 var GroupsMiddleware = require("../../middleware/GroupsMiddleware");
diff --git a/src/gui/app/jsx/stores/GroupsStore.js b/src/gui/app/jsx/stores/GroupsStore.js
index ef4b527..44b2646 100644
(Continue reading)

freenas | 18 Apr 02:29 2015

[freenas/freenas] 13a4e5b: Checkpoint save of first pass at fixing bad hostkeys

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 13a4e5bcbb02676aa0fd306f2023c25e6d68cca3
Author: Josh Paetzel <josh@...>
Date:   Fri Apr 17 17:29:08 2015 -0700

    Checkpoint save of first pass at fixing bad hostkeys

    Ticket: #9221
    Merge-FN93: yes
    Merge-TN93: yes
---
 src/freenas/usr/local/bin/test_ssh.py | 44 ++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/freenas/usr/local/bin/test_ssh.py b/src/freenas/usr/local/bin/test_ssh.py
index b97add0..ba496d7 100755
--- a/src/freenas/usr/local/bin/test_ssh.py
+++ b/src/freenas/usr/local/bin/test_ssh.py
 <at>  <at>  -27,7 +27,6  <at>  <at> 

 import os
 import paramiko
-from time import sleep
 import socket
 import sys

 <at>  <at>  -43,20 +42,40  <at>  <at>  cache.get_apps()
(Continue reading)

freenas | 18 Apr 02:04 2015

[freenas/freenas] d49a9de: Display all users within a group in GroupItem controller view Ticket: #8857

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit d49a9defd4187830c2e41a23e6ea5e8598854009
Author: Erin Clark <erin@...>
Date:   Fri Apr 17 17:01:52 2015 -0700

    Display all users within a group in GroupItem controller view
    Ticket: #8857
---
 .../app/jsx/views/Accounts/Groups/GroupItem.jsx    | 39 +++++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/gui/app/jsx/views/Accounts/Groups/GroupItem.jsx b/src/gui/app/jsx/views/Accounts/Groups/GroupItem.jsx
index 7b06bac..b5907a0 100644
--- a/src/gui/app/jsx/views/Accounts/Groups/GroupItem.jsx
+++ b/src/gui/app/jsx/views/Accounts/Groups/GroupItem.jsx
 <at>  <at>  -36,12 +36,23  <at>  <at>  var GroupView = React.createClass({
     }

   , getMembers: function( groupid ) {
-    if ( UsersStore.getUsersByGroup( groupid )[0] ) {
-      return UsersStore.getUsersByGroup( groupid )[0].username;
+    if ( UsersStore.getUsersByGroup( groupid ) ) {
+      return UsersStore.getUsersByGroup( groupid );
     } else {
-      return "";
+      return [];
     }
(Continue reading)


Gmane