From 5c030c36c5f5df8f678d781ea204dcc1f70e6f1e Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 18:54:18 -0500 Subject: [PATCH] removed dependice on node-cdm --- lxc.js | 15 ++++++++++----- routes/api.js | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lxc.js b/lxc.js index d2afd83..7e0c348 100644 --- a/lxc.js +++ b/lxc.js @@ -1,10 +1,15 @@ 'use strict'; -var cmd = require('node-cmd'); +var exec = require('child_process').exec; -var sysExec = function(command, callback){ - // console.log('sysExec: ', command, '||| callback:', callback) - cmd.get('unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; '+command, callback); -}; +function sysExec(command,callback){exec(command, + command = 'unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; ' + command + (function(){ + return function(err,data,stderr){ + if(!callback) return; + callback(data, err, stderr); + } + })(callback) +);} var lxc = { create: function(name, template, config, callback){ diff --git a/routes/api.js b/routes/api.js index 171e226..45ceac9 100644 --- a/routes/api.js +++ b/routes/api.js @@ -6,7 +6,7 @@ var extend = require('node.extend'); var redis = require("redis"); var client = redis.createClient(); var lxc = require('../lxc'); -//lxc.startEphemeral('ubuntu_template', 'ue0', function(){console.log('cb1', arguments)}, function(){console.log('cb2', arguments)}) + router.get('/start/:name', function(req, res, next){ lxc.start(req.params.name, function(status, message){ if(status){