From f5e3655bfd66d19b37f1359fa91f841b687e339d Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Tue, 15 Sep 2020 00:49:38 +0200
Subject: [bug] fix variable in template

- add some extra debug info for troubleshooting start errors
- fix vendors labels
---
 pkg/vpn/launcher_linux.go | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'pkg/vpn')

diff --git a/pkg/vpn/launcher_linux.go b/pkg/vpn/launcher_linux.go
index 3a29789..ba505b8 100644
--- a/pkg/vpn/launcher_linux.go
+++ b/pkg/vpn/launcher_linux.go
@@ -40,6 +40,7 @@ var (
 var bitmaskRootPaths = []string{
 	"/usr/sbin/bitmask-root",
 	"/usr/local/sbin/bitmask-root",
+	snapBitmaskRootPath,
 }
 
 type launcher struct {
@@ -59,27 +60,33 @@ func (l *launcher) close() error {
 func (l *launcher) check() (helpers bool, privilege bool, err error) {
 	hasHelpers, err := hasHelpers()
 	if err != nil {
+		log.Println("Error checking helpers")
 		return
 	}
 	if !hasHelpers {
+		log.Println("Could not find helpers")
 		return false, true, nil
 	}
 
 	isRunning, err := isPolkitRunning()
 	if err != nil {
+		log.Println("Error checking if polkit is running")
 		return
 	}
 
 	if !isRunning {
 		polkitPath := getPolkitPath()
 		if polkitPath == "" {
+			log.Println("Cannot find any usable polkit")
 			return true, false, nil
 		}
 		cmd := exec.Command("setsid", polkitPath)
 		err = cmd.Start()
 		if err != nil {
+			log.Println("Cannot launch polkit")
 			return
 		}
+		log.Println("Checking if polkit is running after attempted launch")
 		isRunning, err = isPolkitRunning()
 		return true, isRunning, err
 	}
-- 
cgit v1.2.3