many: rename StripGlobalRootDir to StripRootDir

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
canonical · Aug 24, 2016 · 05bc35a · 05bc35a
1 parent 04b09b4
commit 05bc35a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dirs/dirs.go b/dirs/dirs.go
@@ -73,8 +73,8 @@ func init() {
 	SetRootDir(root)
 }
 
-// StripGlobalRootDir strips the custom global root directory from the specified argument.
-func StripGlobalRootDir(dir string) string {
+// StripRootDir strips the custom global root directory from the specified argument.
+func StripRootDir(dir string) string {
 	if GlobalRootDir == "/" {
 		return dir
 	}

diff --git a/overlord/snapstate/backend/mountunit.go b/overlord/snapstate/backend/mountunit.go
@@ -32,8 +32,8 @@ import (
 )
 
 func addMountUnit(s *snap.Info, meter progress.Meter) error {
-	squashfsPath := dirs.StripGlobalRootDir(s.MountFile())
-	whereDir := dirs.StripGlobalRootDir(s.MountDir())
+	squashfsPath := dirs.StripRootDir(s.MountFile())
+	whereDir := dirs.StripRootDir(s.MountDir())
 
 	sysd := systemd.New(dirs.GlobalRootDir, meter)
 	mountUnitName, err := sysd.WriteMountUnitFile(s.Name(), squashfsPath, whereDir, "squashfs")
@@ -56,7 +56,7 @@ func addMountUnit(s *snap.Info, meter progress.Meter) error {
 
 func removeMountUnit(baseDir string, meter progress.Meter) error {
 	sysd := systemd.New(dirs.GlobalRootDir, meter)
-	unit := systemd.MountUnitPath(dirs.StripGlobalRootDir(baseDir), "mount")
+	unit := systemd.MountUnitPath(dirs.StripRootDir(baseDir), "mount")
 	if osutil.FileExists(unit) {
 		if err := sysd.Stop(filepath.Base(unit), time.Duration(1*time.Second)); err != nil {
 			return err