errtracker: use a helper for checking whether snapd reexeced

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
kbroulik · Jun 22, 2020 · edb5b48 · edb5b48
1 parent 3dc1ca5
commit edb5b48
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/errtracker/errtracker.go b/errtracker/errtracker.go
@@ -42,6 +42,7 @@ import (
 	"github.com/snapcore/snapd/osutil"
 	"github.com/snapcore/snapd/release"
 	"github.com/snapcore/snapd/snapdenv"
+	"github.com/snapcore/snapd/snapdtool"
 )
 
 var (
@@ -216,12 +217,11 @@ func snapConfineProfileDigest(suffix string) string {
 }
 
 var didSnapdReExec = func() string {
-	// TODO: move this into osutil.Reexeced() ?
-	exe, err := os.Readlink(procSelfExe)
+	didReexec, err := snapdtool.IsReexecd()
 	if err != nil {
 		return "unknown"
 	}
-	if strings.HasPrefix(exe, dirs.SnapMountDir) {
+	if didReexec {
 		return "yes"
 	}
 	return "no"