summaryrefslogtreecommitdiff
path: root/pkg/standalone
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2019-09-25 12:08:07 +0200
committerKali Kaneko (leap communications) <kali@leap.se>2019-10-04 19:11:00 -0600
commit967351425241d00364a3ebd77722206aa17fb95a (patch)
treeb5767df18be3eba3684353a36dbf9a7d981062af /pkg/standalone
parent924428be162fe908d434c62a57e7321c4f56c1fd (diff)
[bug] firewall isup return 1 is not an error
bitmask-root firewall isup uses the return code to signal if the firewall is up or not. We should not report it as an error. - Resolves: #179
Diffstat (limited to 'pkg/standalone')
-rw-r--r--pkg/standalone/launcher_linux.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/standalone/launcher_linux.go b/pkg/standalone/launcher_linux.go
index f2d0392..76f74f8 100644
--- a/pkg/standalone/launcher_linux.go
+++ b/pkg/standalone/launcher_linux.go
@@ -193,13 +193,12 @@ func runBitmaskRoot(arg ...string) error {
arg = append([]string{bitmaskRoot}, arg...)
out, err := exec.Command("pkexec", arg...).Output()
- if err != nil {
+ if err != nil && arg[2] != "isup" {
log.Println("Error while running bitmask-root:")
log.Println("args: ", arg)
log.Println("output: ", string(out))
- return err
}
- return nil
+ return err
}
func bitmaskRootPath() (string, error) {