From 1a6cb09ec9a66bcfed6d06fb8774c2b7751ef390 Mon Sep 17 00:00:00 2001 From: Patrick Pacher Date: Tue, 25 Jan 2022 14:31:34 +0100 Subject: [PATCH] Test for /proc/self/ns/user instead of sysctl --- updates/helper/electron.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/updates/helper/electron.go b/updates/helper/electron.go index cb997667..a82f5bfd 100644 --- a/updates/helper/electron.go +++ b/updates/helper/electron.go @@ -23,10 +23,14 @@ func EnsureChromeSandboxPermissions(reg *updater.ResourceRegistry) error { return nil } - if checkSysctl("kernel.unprivileged_userns_clone", '1') { - log.Debug("updates: kernel support for unprivileged USERNS_CLONE is enabled") + _, err := os.Stat("/proc/self/ns/user") + if err == nil { return nil } + if !os.IsNotExist(err) { + return err + } + // err == ENOENT if pmElectronUpdate != nil && !pmElectronUpdate.UpgradeAvailable() { return nil @@ -35,7 +39,6 @@ func EnsureChromeSandboxPermissions(reg *updater.ResourceRegistry) error { log.Debug("updates: kernel support for unprivileged USERNS_CLONE disabled") - var err error pmElectronUpdate, err = reg.GetFile(identifier) if err != nil { return err