Cleaned execution of ExclFS

Author: piranna

lib/jocker_root.js

@@ -12,8 +12,7 @@ const MS_NODEV  = flags.MS_NODEV
 const MS_NOSUID = flags.MS_NOSUID
 
 
-const EXCLFS_BIN = '/bin/exclfs'
-const HOME       = '/tmp'
+const HOME = '/tmp'
 
 
 /**
@@ -106,47 +105,28 @@ function prepareRootFilesystems(upperdir, callback)
     }
   ]
 
-  // Using ExclFS filesystem
-  fs.access(EXCLFS_BIN, fs.constants.X_OK, function(error)
+  const path = upperdir+'/dev'
+
+  mkdirp(path, '0000', function(error)
   {
-    var path = upperdir+'/dev'
+    if(error && error.code !== 'EEXIST') return callback(error)
 
-    if(error)
+    var argv = ['/dev', path, '-o', 'ownerPerm=true']
+    var options =
     {
-      arr.unshift({
-        path: path,
-        flags: MS_BIND,
-        extras: {devFile: '/dev'}
-      })
-
-      return async.each(arr, mkdirMountInfo, callback)
+      detached: true,
+      stdio: 'inherit'
     }
 
-    mkdirp(path, '0000', function(error)
-    {
-      if(error && error.code !== 'EEXIST') return callback(error)
-
-      var argv = ['/dev', path, '-o', 'ownerPerm=true']
-      var options =
-      {
-        detached: true,
-        stdio: 'inherit'
-      }
-
-      spawn(EXCLFS_BIN, argv, options)
-      .on('error', console.error.bind(console))
-      .unref()
-
-      waitUntilDevMounted(path, 5, function(error)
-      {
-        if(error) return callback(error)
+    spawn('exclfs', argv, options)
+    .on('error', console.error.bind(console))
+    .unref()
 
-        // Remove ExclFS from initramfs to free memory
-        rimraf(EXCLFS_BIN)
-        rimraf('/lib/node_modules/exclfs')
+    waitUntilDevMounted(path, 5, function(error)
+    {
+      if(error) return callback(error)
 
-        async.each(arr, mkdirMountInfo, callback)
-      })
+      async.each(arr, mkdirMountInfo, callback)
     })
   })
 }

package.json

@@ -22,6 +22,7 @@
   "homepage": "https://github.com/NodeOS/nodeos-mount-filesystems",
   "dependencies": {
     "async": "^2.1.4",
+    "exclfs": "^0.0.5",
     "linux-cmdline": "^1.0.0",
     "mkdirp": "^0.5.1",
     "nodeos-boot-singleUser": "^0.4.2",