cmd/snap: rework relocation logic for the right path to snap-confine

snapcore · Apr 27, 2017 · 8c30864 · 8c30864
1 parent 24ff7c7
commit 8c30864
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/cmd/snap/cmd_run.go b/cmd/snap/cmd_run.go
@@ -366,11 +366,7 @@ func migrateXauthority(info *snap.Info) (string, error) {
 }
 
 func runSnapConfine(info *snap.Info, securityTag, snapApp, command, hook string, args []string) error {
-	libExecDir := dirs.DistroLibExecDir
-	if isReexeced() {
-		libExecDir = dirs.CoreLibExecDir
-	}
-	snapConfine := filepath.Join(libExecDir, "snap-confine")
+	snapConfine := filepath.Join(dirs.DistroLibExecDir, "snap-confine")
 	if !osutil.FileExists(snapConfine) {
 		if hook != "" {
 			logger.Noticef("WARNING: skipping running hook %q of snap %q: missing snap-confine", hook, info.Name())
@@ -413,7 +409,7 @@ func runSnapConfine(info *snap.Info, securityTag, snapApp, command, hook string,
 		// run snap-confine from the core snap. that will work because
 		// snap-confine on the core snap is mostly statically linked
 		// (except libudev and libc)
-		cmd[0] = filepath.Join(dirs.SnapMountDir, "core/current", cmd[0])
+		cmd[0] = filepath.Join(dirs.SnapMountDir, "core/current", dirs.CoreLibExecDir, "snap-confine")
 	}
 
 	extraEnv := make(map[string]string)