dirs,overlord: drop RawSnapMountDir and strip prefix instead

snapcore · May 17, 2017 · 9b771dd · 9b771dd
1 parent 2f3b287
commit 9b771dd
Show file tree

Hide file tree

Showing 7 changed files with 147 additions and 152 deletions.
diff --git a/dirs/dirs.go b/dirs/dirs.go
@@ -33,9 +33,6 @@ var (
 	GlobalRootDir string
 
 	SnapMountDir string
-	// RawSnapMountDir is the path of the snap mount dir without
-	// the GlobalRootDir as prefix.
-	RawSnapMountDir string
 
 	// CoreSnapMountDir is the path of the snap mount dir inside
 	// the snap confinement environment. Give this nature it will
@@ -44,8 +41,8 @@ var (
 
 	// CoreLibExecDir is similar to CoreSnapMountDir but for the
 	// LibExecDir used by snapd.
-	CoreLibExecDir            string
-	DistroLibExecDir          string
+	CoreLibExecDir   string
+	DistroLibExecDir string
 
 	SnapBlobDir               string
 	SnapDataDir               string
@@ -138,11 +135,9 @@ func SetRootDir(rootdir string) {
 
 	switch release.ReleaseInfo.ID {
 	case "fedora", "centos", "rhel", "arch":
-		RawSnapMountDir = "/var/lib/snapd/snap"
-		SnapMountDir = filepath.Join(rootdir, RawSnapMountDir)
+		SnapMountDir = filepath.Join(rootdir, "/var/lib/snapd/snap")
 	default:
-		RawSnapMountDir = defaultSnapMountDir
-		SnapMountDir = filepath.Join(rootdir, RawSnapMountDir)
+		SnapMountDir = filepath.Join(rootdir, defaultSnapMountDir)
 	}
 
 	SnapDataDir = filepath.Join(rootdir, "/var/snap")

diff --git a/overlord/managers_test.go b/overlord/managers_test.go
@@ -200,10 +200,10 @@ apps:
 	c.Assert(osutil.FileExists(filepath.Join(dirs.SnapBlobDir, "foo_x1.snap")), Equals, true)
 
 	// ensure the right unit is created
-	mup := systemd.MountUnitPath(filepath.Join(dirs.RawSnapMountDir, "foo/x1"))
+	mup := systemd.MountUnitPath(filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "foo/x1"))
 	content, err := ioutil.ReadFile(mup)
 	c.Assert(err, IsNil)
-	c.Assert(string(content), Matches, fmt.Sprintf("(?ms).*^Where=%s/foo/x1", dirs.RawSnapMountDir))
+	c.Assert(string(content), Matches, fmt.Sprintf("(?ms).*^Where=%s/foo/x1", dirs.StripRootDir(dirs.SnapMountDir)))
 	c.Assert(string(content), Matches, "(?ms).*^What=/var/lib/snapd/snaps/foo_x1.snap")
 
 }
@@ -242,7 +242,7 @@ apps:
 
 	// snap file and its mount
 	c.Assert(osutil.FileExists(filepath.Join(dirs.SnapBlobDir, "foo_x1.snap")), Equals, false)
-	mup := systemd.MountUnitPath(filepath.Join(dirs.RawSnapMountDir, "foo/x1"))
+	mup := systemd.MountUnitPath(filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "foo/x1"))
 	c.Assert(osutil.FileExists(mup), Equals, false)
 }
 
@@ -634,10 +634,10 @@ apps:
 	c.Assert(osutil.FileExists(filepath.Join(dirs.SnapBlobDir, "foo_55.snap")), Equals, true)
 
 	// ensure the right unit is created
-	mup := systemd.MountUnitPath(filepath.Join(dirs.RawSnapMountDir, "foo/55"))
+	mup := systemd.MountUnitPath(filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "foo/55"))
 	content, err := ioutil.ReadFile(mup)
 	c.Assert(err, IsNil)
-	c.Assert(string(content), Matches, fmt.Sprintf("(?ms).*^Where=%s/foo/55", dirs.RawSnapMountDir))
+	c.Assert(string(content), Matches, fmt.Sprintf("(?ms).*^Where=%s/foo/55", dirs.StripRootDir(dirs.SnapMountDir)))
 	c.Assert(string(content), Matches, "(?ms).*^What=/var/lib/snapd/snaps/foo_55.snap")
 }
 

diff --git a/overlord/snapstate/backend/mountunit_test.go b/overlord/snapstate/backend/mountunit_test.go
@@ -76,7 +76,7 @@ func (s *mountunitSuite) TestAddMountUnit(c *C) {
 	c.Assert(err, IsNil)
 
 	// ensure correct mount unit
-	un := fmt.Sprintf("%s.mount", systemd.EscapeUnitNamePath(filepath.Join(dirs.RawSnapMountDir, "foo", "13")))
+	un := fmt.Sprintf("%s.mount", systemd.EscapeUnitNamePath(filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "foo", "13")))
 	mount, err := ioutil.ReadFile(filepath.Join(dirs.SnapServicesDir, un))
 	c.Assert(err, IsNil)
 	c.Assert(string(mount), Equals, fmt.Sprintf(`[Unit]
@@ -90,7 +90,7 @@ Options=nodev,ro
 
 [Install]
 WantedBy=multi-user.target
-`, dirs.RawSnapMountDir))
+`, dirs.StripRootDir(dirs.SnapMountDir)))
 
 }
 
@@ -108,7 +108,7 @@ func (s *mountunitSuite) TestRemoveMountUnit(c *C) {
 	c.Assert(err, IsNil)
 
 	// ensure we have the files
-	un := fmt.Sprintf("%s.mount", systemd.EscapeUnitNamePath(filepath.Join(dirs.RawSnapMountDir, "foo", "13")))
+	un := fmt.Sprintf("%s.mount", systemd.EscapeUnitNamePath(filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "foo", "13")))
 	p := filepath.Join(dirs.SnapServicesDir, un)
 	c.Assert(osutil.FileExists(p), Equals, true)
 

diff --git a/overlord/snapstate/backend/setup_test.go b/overlord/snapstate/backend/setup_test.go
@@ -83,10 +83,10 @@ func (s *setupSuite) TestSetupDoUndoSimple(c *C) {
 	c.Assert(osutil.FileExists(filepath.Join(dirs.SnapBlobDir, "hello_14.snap")), Equals, true)
 
 	// ensure the right unit is created
-	mup := systemd.MountUnitPath(filepath.Join(dirs.RawSnapMountDir, "hello/14"))
+	mup := systemd.MountUnitPath(filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "hello/14"))
 	content, err := ioutil.ReadFile(mup)
 	c.Assert(err, IsNil)
-	c.Assert(string(content), Matches, fmt.Sprintf("(?ms).*^Where=%s", filepath.Join(dirs.RawSnapMountDir, "hello/14")))
+	c.Assert(string(content), Matches, fmt.Sprintf("(?ms).*^Where=%s", filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "hello/14")))
 	c.Assert(string(content), Matches, "(?ms).*^What=/var/lib/snapd/snaps/hello_14.snap")
 
 	minInfo := snap.MinimalPlaceInfo("hello", snap.R(14))

diff --git a/overlord/snapstate/handlers_link_test.go b/overlord/snapstate/handlers_link_test.go
@@ -159,7 +159,7 @@ func (s *linkSnapSuite) TestDoLinkSnapTryToCleanupOnError(c *C) {
 		Channel:  "beta",
 	})
 
-	s.fakeBackend.linkSnapFailTrigger = filepath.Join(dirs.RawSnapMountDir, "foo/35")
+	s.fakeBackend.linkSnapFailTrigger = filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "foo/35")
 	s.state.NewChange("dummy", "...").AddTask(t)
 	s.state.Unlock()
 
@@ -181,11 +181,11 @@ func (s *linkSnapSuite) TestDoLinkSnapTryToCleanupOnError(c *C) {
 		},
 		{
 			op:   "link-snap.failed",
-			name: filepath.Join(dirs.RawSnapMountDir, "foo/35"),
+			name: filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "foo/35"),
 		},
 		{
 			op:   "unlink-snap",
-			name: filepath.Join(dirs.RawSnapMountDir, "foo/35"),
+			name: filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "foo/35"),
 		},
 	})
 }

diff --git a/overlord/snapstate/handlers_mount_test.go b/overlord/snapstate/handlers_mount_test.go
@@ -131,7 +131,7 @@ func (s *mountSnapSuite) TestDoUndoMountSnap(c *C) {
 	c.Check(s.fakeBackend.ops, DeepEquals, fakeOps{
 		{
 			op:  "current",
-			old: filepath.Join(dirs.RawSnapMountDir, "core/1"),
+			old: filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "core/1"),
 		},
 		{
 			op:    "setup-snap",
@@ -140,7 +140,7 @@ func (s *mountSnapSuite) TestDoUndoMountSnap(c *C) {
 		},
 		{
 			op:    "undo-setup-snap",
-			name:  filepath.Join(dirs.RawSnapMountDir, "core/2"),
+			name:  filepath.Join(dirs.StripRootDir(dirs.SnapMountDir), "core/2"),
 			stype: "os",
 		},
 	})