Updated rpcd version

This commit is contained in:
Martin Schröder 2015-05-18 12:51:12 +02:00 committed by Martin Schröder
parent f073695c17
commit c65423e091
4 changed files with 18 additions and 5 deletions

View file

@ -45,6 +45,8 @@ define Package/luciexpress/install
$(INSTALL_DIR) $(1)/usr/share/rpcd
$(CP) ./share/* $(1)/usr/share/rpcd/
./install_menus.sh $(1)
$(INSTALL_DIR) $(1)/etc/
$(CP) ./etc/* $(1)/etc/
$(INSTALL_DIR) $(1)/usr/lib/rpcd
$(INSTALL_BIN) $(PKG_BUILD_DIR)/rpcd/luciexpress.so $(1)/usr/lib/rpcd/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/rpcd/bwmon.so $(1)/usr/lib/rpcd/

View file

@ -128,6 +128,8 @@
},
"include": {
"path": { dvalue: "", type: String },
"type": { dvalue: "", type: String },
"family": { dvalue: "", type: String },
"reload": { dvalue: true, type: Boolean }
},
"dmzhost": {
@ -558,6 +560,11 @@
var deferred = $.Deferred();
console.log("Init UCI");
var self = this;
if(!$rpc.uci) {
setTimeout(function(){ deferred.reject(); }, 0);
return deferred.promise();
}
$rpc.uci.configs().done(function(response){
var cfigs = response.configs;
if(!cfigs) { next("could not retrieve list of configs!"); return; }
@ -609,9 +616,9 @@
}
async.eachSeries(configs, function(cf, next){
if(!(cf in self)) {
throw new Error("invalid config name "+cf);
//next();
//return;
//throw new Error("invalid config name "+cf);
next();
return;
};
self[cf].$sync().done(function(){
console.log("Synched config "+cf);

View file

@ -7,7 +7,7 @@
<h2 class="form-signin-heading" translate>Please sign in</h2>
<div class="alert alert-danger" ng-show="errors.length">
<ul>
<li ng-repeat="item in errors">{{item}}</li>
<li ng-repeat="item in errors track by $index">{{item}}</li>
</ul>
</div>
<div class="form-group" ng-show="showHost">

View file

@ -9,7 +9,11 @@
"grunt-angular-gettext": "*",
"request": "*",
"glob": "*",
"async": "*"
"async": "*",
"expect.js": "*",
"object-assign": "*",
"jquery-deferred": "*",
"najax": "*"
},
"engines": {
"node": "0.10.x",