Merge pull request #1611 from ipfs/quick-fix/ipns-err

jbenet · jbenet · commit 7abebb16531b · 2015-08-27T02:51:36.000+02:00
dont create ipnsfs filesystem until its needed
diff --git a/core/core.go b/core/core.go
@@ -38,7 +38,6 @@ import (
 
 	routing "github.com/ipfs/go-ipfs/routing"
 	dht "github.com/ipfs/go-ipfs/routing/dht"
-	kb "github.com/ipfs/go-ipfs/routing/kbucket"
 	nilrouting "github.com/ipfs/go-ipfs/routing/none"
 	offroute "github.com/ipfs/go-ipfs/routing/offline"
 
@@ -162,15 +161,6 @@ func NewIPFSNode(ctx context.Context, option ConfigOption) (*IpfsNode, error) {
 	}
 	node.Resolver = &path.Resolver{DAG: node.DAG}
 
-	// Setup the mutable ipns filesystem structure
-	if node.OnlineMode() {
-		fs, err := ipnsfs.NewFilesystem(ctx, node.DAG, node.Namesys, node.Pinning, node.PrivateKey)
-		if err != nil && err != kb.ErrLookupFailure {
-			return nil, err
-		}
-		node.IpnsFs = fs
-	}
-
 	success = true
 	return node, nil
 }
diff --git a/fuse/ipns/mount_unix.go b/fuse/ipns/mount_unix.go
@@ -6,13 +6,22 @@ package ipns
 import (
 	core "github.com/ipfs/go-ipfs/core"
 	mount "github.com/ipfs/go-ipfs/fuse/mount"
+	ipnsfs "github.com/ipfs/go-ipfs/ipnsfs"
 )
 
 // Mount mounts ipns at a given location, and returns a mount.Mount instance.
 func Mount(ipfs *core.IpfsNode, ipnsmp, ipfsmp string) (mount.Mount, error) {
 	cfg := ipfs.Repo.Config()
 	allow_other := cfg.Mounts.FuseAllowOther
 
+	if ipfs.IpnsFs == nil {
+		fs, err := ipnsfs.NewFilesystem(ipfs.Context(), ipfs.DAG, ipfs.Namesys, ipfs.Pinning, ipfs.PrivateKey)
+		if err != nil {
+			return nil, err
+		}
+		ipfs.IpnsFs = fs
+	}
+
 	fsys, err := NewFileSystem(ipfs, ipfs.PrivateKey, ipfsmp, ipnsmp)
 	if err != nil {
 		return nil, err
