From 8e9ef0f873bf37ac4e68bd22f473cd3f4d5cd08e Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 22:23:59 -0500 Subject: [PATCH 01/26] testing --- lxc.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lxc.js b/lxc.js index 8a19ec6..ed9a7fc 100644 --- a/lxc.js +++ b/lxc.js @@ -6,8 +6,9 @@ function sysExec(command, callback){ return exec(command, (function(){ return function(err,data,stderr){ - if(!callback) return; - callback(data, err, stderr); + if(callback){ + return callback(data, err, stderr); + } } })(callback)); }; From 03339464a794371e05cb0b73dfb7351435dc23fb Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 22:25:37 -0500 Subject: [PATCH 02/26] testing --- lxc.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lxc.js b/lxc.js index ed9a7fc..9088deb 100644 --- a/lxc.js +++ b/lxc.js @@ -5,12 +5,12 @@ function sysExec(command, callback){ command = 'unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; ' + command; return exec(command, (function(){ - return function(err,data,stderr){ - if(callback){ - return callback(data, err, stderr); - } - } - })(callback)); + return function(err,data,stderr){ + if(callback){ + return callback(data, err, stderr); + } + } + })(callback)); }; var lxc = { From f7da175a47d7aa64650e11edc4981f60c4a34cd5 Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:23:10 -0500 Subject: [PATCH 03/26] testing --- lxc.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lxc.js b/lxc.js index 9088deb..ec000be 100644 --- a/lxc.js +++ b/lxc.js @@ -4,7 +4,7 @@ var exec = require('child_process').exec; function sysExec(command, callback){ command = 'unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; ' + command; - return exec(command, (function(){ + return exec(command, (function(callback){ return function(err,data,stderr){ if(callback){ return callback(data, err, stderr); @@ -99,7 +99,9 @@ var lxc = { info.push(mapOut); } - callback(info); + var args = [].slice.call(arguments); + args[0] = info; + callback.apply(args); }); } }; From 52583f52303228995c1e90a786b9c11c8a91e43d Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:38:52 -0500 Subject: [PATCH 04/26] generic --- lxc.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lxc.js b/lxc.js index ec000be..9433842 100644 --- a/lxc.js +++ b/lxc.js @@ -100,7 +100,9 @@ var lxc = { } var args = [].slice.call(arguments); + console.log('args~103', args) args[0] = info; + console.log('info~105', info) callback.apply(args); }); } From 95286f8e61a64d05e614a7af35f88cb1f875c402 Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:40:01 -0500 Subject: [PATCH 05/26] generic --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index 9433842..47b04ea 100644 --- a/lxc.js +++ b/lxc.js @@ -102,7 +102,7 @@ var lxc = { var args = [].slice.call(arguments); console.log('args~103', args) args[0] = info; - console.log('info~105', info) + console.log('args~105', args) callback.apply(args); }); } From c5f552da31d4131a26559584cb8a178b176c15a2 Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:41:08 -0500 Subject: [PATCH 06/26] generic --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index 47b04ea..36d3cb0 100644 --- a/lxc.js +++ b/lxc.js @@ -103,7 +103,7 @@ var lxc = { console.log('args~103', args) args[0] = info; console.log('args~105', args) - callback.apply(args); + callback.apply(this, args); }); } }; From d79e2aab08d3ece8aeec32f08ec0d7263fed0043 Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:45:47 -0500 Subject: [PATCH 07/26] generic --- lxc.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lxc.js b/lxc.js index 36d3cb0..7463214 100644 --- a/lxc.js +++ b/lxc.js @@ -99,11 +99,7 @@ var lxc = { info.push(mapOut); } - var args = [].slice.call(arguments); - console.log('args~103', args) - args[0] = info; - console.log('args~105', args) - callback.apply(this, args); + callback.apply(this, [info].slice.call(arguments).splice(1,1)); }); } }; From 21f541b309510994a662bdb6769817a3e6e34852 Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:46:53 -0500 Subject: [PATCH 08/26] generic --- lxc.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index 7463214..91a9527 100644 --- a/lxc.js +++ b/lxc.js @@ -99,7 +99,9 @@ var lxc = { info.push(mapOut); } - callback.apply(this, [info].slice.call(arguments).splice(1,1)); + var args = [info].slice.call(arguments).splice(1,1); + console.log('args:', args) + callback.apply(this, args); }); } }; From 0f1a53f2dc074d977e2ff893d851f031a1fc7a32 Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:48:13 -0500 Subject: [PATCH 09/26] generic --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index 91a9527..f5d5c0e 100644 --- a/lxc.js +++ b/lxc.js @@ -99,7 +99,7 @@ var lxc = { info.push(mapOut); } - var args = [info].slice.call(arguments).splice(1,1); + var args = [].slice.call(arguments); console.log('args:', args) callback.apply(this, args); }); From 9c690f32395c0bd5f74976f255e2edfafaa07696 Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:49:51 -0500 Subject: [PATCH 10/26] generic --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index f5d5c0e..9813d93 100644 --- a/lxc.js +++ b/lxc.js @@ -99,7 +99,7 @@ var lxc = { info.push(mapOut); } - var args = [].slice.call(arguments); + var args = [].slice.call(arguments).splice(0, 1, info); console.log('args:', args) callback.apply(this, args); }); From 06b07f93418fe7a463250c6aaa2aa64816900ecf Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:58:48 -0500 Subject: [PATCH 11/26] generic --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index 9813d93..1dc52f8 100644 --- a/lxc.js +++ b/lxc.js @@ -99,7 +99,7 @@ var lxc = { info.push(mapOut); } - var args = [].slice.call(arguments).splice(0, 1, info); + var args = [].slice.call(arguments).splice(1, 0, info).slice(1,99); console.log('args:', args) callback.apply(this, args); }); From 7df648c02b362a4121f632901eea9b06ea56aead Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:59:23 -0500 Subject: [PATCH 12/26] generic --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index 1dc52f8..b67efe0 100644 --- a/lxc.js +++ b/lxc.js @@ -99,7 +99,7 @@ var lxc = { info.push(mapOut); } - var args = [].slice.call(arguments).splice(1, 0, info).slice(1,99); + var args = ([].slice.call(arguments)).splice(1, 0, info).slice(1,99); console.log('args:', args) callback.apply(this, args); }); From 16bc9a051362008bf733fb80a113341a776ebd0b Mon Sep 17 00:00:00 2001 From: william Date: Sat, 30 Jan 2016 23:59:58 -0500 Subject: [PATCH 13/26] generic --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index b67efe0..ce753e3 100644 --- a/lxc.js +++ b/lxc.js @@ -99,7 +99,7 @@ var lxc = { info.push(mapOut); } - var args = ([].slice.call(arguments)).splice(1, 0, info).slice(1,99); + var args = [].slice.call(arguments)/*.splice(1, 0, info).slice(1,99);*/ console.log('args:', args) callback.apply(this, args); }); From 0a8bdf9c5bed02b740d2a67982c365f1e8b2e302 Mon Sep 17 00:00:00 2001 From: william Date: Sun, 31 Jan 2016 00:01:17 -0500 Subject: [PATCH 14/26] generic --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index ce753e3..a4b37f8 100644 --- a/lxc.js +++ b/lxc.js @@ -99,7 +99,7 @@ var lxc = { info.push(mapOut); } - var args = [].slice.call(arguments)/*.splice(1, 0, info).slice(1,99);*/ + var args = [info].concat([].slice.call(arguments).slice(1,99)); console.log('args:', args) callback.apply(this, args); }); From d1fbd91b2e6f5ef8033f5be6fb2f6ae36d3d4be5 Mon Sep 17 00:00:00 2001 From: william Date: Sun, 31 Jan 2016 00:02:03 -0500 Subject: [PATCH 15/26] generic --- lxc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lxc.js b/lxc.js index a4b37f8..b4d968e 100644 --- a/lxc.js +++ b/lxc.js @@ -100,8 +100,8 @@ var lxc = { } var args = [info].concat([].slice.call(arguments).slice(1,99)); - console.log('args:', args) - callback.apply(this, args); + // console.log('args:', args) + callback.apply(args); }); } }; From 6a50e833b2b91937ae9e1702e035084678eb19ce Mon Sep 17 00:00:00 2001 From: william Date: Sun, 31 Jan 2016 00:16:06 -0500 Subject: [PATCH 16/26] generic --- lxc.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lxc.js b/lxc.js index b4d968e..37dc5ab 100644 --- a/lxc.js +++ b/lxc.js @@ -76,7 +76,9 @@ var lxc = { var temp = data[i].split(/\:\s+/); info[temp[0].toLowerCase().trim()] = temp[1].trim(); } - callback(info); + + var args = [info].concat([].slice.call(arguments).slice(1,99)); + return callback.apply(this, args); }); }, @@ -100,8 +102,7 @@ var lxc = { } var args = [info].concat([].slice.call(arguments).slice(1,99)); - // console.log('args:', args) - callback.apply(args); + return callback.apply(this, args); }); } }; From ee3174cbf15bb1ae1d7094875e92f5bbb770629a Mon Sep 17 00:00:00 2001 From: william Date: Sun, 31 Jan 2016 01:18:27 -0500 Subject: [PATCH 17/26] generic --- lxc.js | 8 +++----- rx.sh | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 rx.sh diff --git a/lxc.js b/lxc.js index 37dc5ab..88e9d0e 100644 --- a/lxc.js +++ b/lxc.js @@ -76,9 +76,7 @@ var lxc = { var temp = data[i].split(/\:\s+/); info[temp[0].toLowerCase().trim()] = temp[1].trim(); } - - var args = [info].concat([].slice.call(arguments).slice(1,99)); - return callback.apply(this, args); + callback(info); }); }, @@ -101,8 +99,8 @@ var lxc = { info.push(mapOut); } - var args = [info].concat([].slice.call(arguments).slice(1,99)); - return callback.apply(this, args); + + callback(info); }); } }; diff --git a/rx.sh b/rx.sh new file mode 100644 index 0000000..489f2b0 --- /dev/null +++ b/rx.sh @@ -0,0 +1,3 @@ +sudo cgm create all virt +sudo cgm chown all virt $(id -u virt) $(id -g virt) + From aed38d0c4f32be5dc7c2781d9aa52b322ac1b8b8 Mon Sep 17 00:00:00 2001 From: william Date: Tue, 2 Feb 2016 11:46:59 -0500 Subject: [PATCH 18/26] runner --- lxc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lxc.js b/lxc.js index 88e9d0e..d33b2d3 100644 --- a/lxc.js +++ b/lxc.js @@ -99,8 +99,8 @@ var lxc = { info.push(mapOut); } - - callback(info); + var args = [info].concat(arguments.splice(1)); + callback(args); }); } }; From a17ba436da6c0cca1016fc057a7c76353a19edd2 Mon Sep 17 00:00:00 2001 From: william Date: Tue, 2 Feb 2016 11:49:23 -0500 Subject: [PATCH 19/26] runner --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index d33b2d3..8857744 100644 --- a/lxc.js +++ b/lxc.js @@ -99,7 +99,7 @@ var lxc = { info.push(mapOut); } - var args = [info].concat(arguments.splice(1)); + var args = [info].concat(Array.prototype.slice.call(arguments, 1)); callback(args); }); } From 5e3401870327dcda8c4db06cd76c0f6dae643403 Mon Sep 17 00:00:00 2001 From: william Date: Tue, 2 Feb 2016 11:55:15 -0500 Subject: [PATCH 20/26] runner --- lxc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lxc.js b/lxc.js index 8857744..d759500 100644 --- a/lxc.js +++ b/lxc.js @@ -100,6 +100,7 @@ var lxc = { } var args = [info].concat(Array.prototype.slice.call(arguments, 1)); + console.log(args) callback(args); }); } From aed8da4ef049801f1af7560a9d7e0d767cc3dfaa Mon Sep 17 00:00:00 2001 From: william Date: Tue, 2 Feb 2016 11:57:09 -0500 Subject: [PATCH 21/26] runner --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index d759500..2763b27 100644 --- a/lxc.js +++ b/lxc.js @@ -101,7 +101,7 @@ var lxc = { } var args = [info].concat(Array.prototype.slice.call(arguments, 1)); console.log(args) - callback(args); + callback.apply(this, args); }); } }; From 28d8cfecc4957fa88cf6f75cbf210d6afc5eca3d Mon Sep 17 00:00:00 2001 From: william Date: Tue, 2 Feb 2016 12:00:44 -0500 Subject: [PATCH 22/26] runner --- lxc.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lxc.js b/lxc.js index 2763b27..3e4fc75 100644 --- a/lxc.js +++ b/lxc.js @@ -24,7 +24,8 @@ var lxc = { destroy: function(name, callback){ return sysExec('lxc-destroy -n '+ name, function(data){ - callback(!data.match(/Destroyed container/)); + var args = [data.match(/Destroyed container/)].concat(Array.prototype.slice.call(arguments, 1)); + callback.apply(this, args); }); }, @@ -76,7 +77,8 @@ var lxc = { var temp = data[i].split(/\:\s+/); info[temp[0].toLowerCase().trim()] = temp[1].trim(); } - callback(info); + var args = [info].concat(Array.prototype.slice.call(arguments, 1)); + callback.apply(this, args); }); }, @@ -100,7 +102,6 @@ var lxc = { } var args = [info].concat(Array.prototype.slice.call(arguments, 1)); - console.log(args) callback.apply(this, args); }); } From 4834f303403ba344793685f2124c1ea443bfb65e Mon Sep 17 00:00:00 2001 From: william Date: Tue, 2 Feb 2016 12:02:11 -0500 Subject: [PATCH 23/26] runner --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index 3e4fc75..7efc523 100644 --- a/lxc.js +++ b/lxc.js @@ -24,7 +24,7 @@ var lxc = { destroy: function(name, callback){ return sysExec('lxc-destroy -n '+ name, function(data){ - var args = [data.match(/Destroyed container/)].concat(Array.prototype.slice.call(arguments, 1)); + var args = [(data.match(/Destroyed container/))].concat(Array.prototype.slice.call(arguments, 1)); callback.apply(this, args); }); }, From 8463934651185d5659a86aa6dd2dffad3b6ae20e Mon Sep 17 00:00:00 2001 From: william Date: Tue, 2 Feb 2016 12:03:31 -0500 Subject: [PATCH 24/26] runner --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index 7efc523..4c58263 100644 --- a/lxc.js +++ b/lxc.js @@ -24,7 +24,7 @@ var lxc = { destroy: function(name, callback){ return sysExec('lxc-destroy -n '+ name, function(data){ - var args = [(data.match(/Destroyed container/))].concat(Array.prototype.slice.call(arguments, 1)); + var args = [!!data.match(/Destroyed container/)].concat(Array.prototype.slice.call(arguments, 1)); callback.apply(this, args); }); }, From d30e6c36971ca5b7dcd57b10a1344d4ff6c1907b Mon Sep 17 00:00:00 2001 From: william Date: Tue, 2 Feb 2016 12:04:58 -0500 Subject: [PATCH 25/26] runner --- lxc.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index 4c58263..002677c 100644 --- a/lxc.js +++ b/lxc.js @@ -24,7 +24,9 @@ var lxc = { destroy: function(name, callback){ return sysExec('lxc-destroy -n '+ name, function(data){ - var args = [!!data.match(/Destroyed container/)].concat(Array.prototype.slice.call(arguments, 1)); + var info = data.match(/Destroyed container/); + console.log('destroy info:' info); + var args = [true].concat(Array.prototype.slice.call(arguments, 1)); callback.apply(this, args); }); }, From 2ccbd5b4323de63b9899cb2fbc9bd490e8ea6708 Mon Sep 17 00:00:00 2001 From: william Date: Tue, 2 Feb 2016 12:05:27 -0500 Subject: [PATCH 26/26] runner --- lxc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc.js b/lxc.js index 002677c..648f16b 100644 --- a/lxc.js +++ b/lxc.js @@ -25,7 +25,7 @@ var lxc = { destroy: function(name, callback){ return sysExec('lxc-destroy -n '+ name, function(data){ var info = data.match(/Destroyed container/); - console.log('destroy info:' info); + console.log('destroy info:', info); var args = [true].concat(Array.prototype.slice.call(arguments, 1)); callback.apply(this, args); });