Updated unmount and fixed bootstrap default opts

Author: andrewosh

index.js

@@ -91,13 +91,14 @@ async function start (opts = {}) {
 
   const daemonOpts = {}
   const bootstrapOpts = opts.bootstrap || argv.bootstrap
-  if (bootstrapOpts.length) {
+  if (bootstrapOpts.length && bootstrapOpts[0] !== '') {
     if (bootstrapOpts === false && bootstrapOpts[0] === 'false') {
       daemonOpts.network = { bootstrap: false }
     } else {
       daemonOpts.network = { bootstrap: bootstrapOpts }
     }
   }
+
   const daemon = new HyperdriveDaemon(storageRoot, daemonOpts)
   await daemon.ready()
 

lib/fuse/index.js

@@ -331,17 +331,38 @@ class FuseManager extends EventEmitter {
     }
   }
 
-  async unmount () {
+  async unmount (mnt) {
     await ensureFuse()
+    const self = this
 
-    if (!this._rootMnt) return
+    if (!this._rootMnt) throw new Error('Cannot unmount if the root drive is not mounted.')
 
-    log.debug({ mnt: this._rootMnt }, 'unmounting the root drive')
-    await hyperfuse.unmount(this._rootMnt)
+    // If a mountpoint is not specified, then it is assumed to be the root mount.
+    if (!mnt) return unmountRoot()
 
-    this._rootDrive = null
-    this._rootMnt = null
-    this._rootHandler = null
+    // Otherwise, unmount the subdrive
+    const { path, root } = this._getMountPath(mnt)
+    if (root) return unmountRoot()
+    return unmountSubdrive(path)
+
+    async function unmountRoot () {
+      log.debug({ mnt: this._rootMnt }, 'unmounting the root drive')
+
+      await hyperfuse.unmount(this._rootMnt)
+
+      this._rootDrive = null
+      this._rootMnt = null
+      this._rootHandler = null
+    }
+
+    function unmountSubdrive (path) {
+      return new Promise((resolve, reject) => {
+        this._rootDrive.unmount(path, err => {
+          if (err) return reject(err)
+          return resolve()
+        })
+      })
+    }
   }
 
   async mountDrive (path, opts) {
@@ -415,8 +436,11 @@ function createFuseHandlers (fuseManager) {
     },
 
     unmount: async (call) => {
+      const mnt = call.request.getPath()
+
+      await fuseManager.unmount(mnt)
+
       const rsp = rpc.fuse.messages.UnmountResponse()
-      await fuseManager.unmount()
       return rsp
     },