Skip to content

fix: Use lscpu to detect lack of confinement #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
farshidtz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Use lscpu to detect lack of confinement #400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions pkg/snap/snap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"os"
"os/exec"
"strings"

"github.com/canonical/go-snapctl"
Expand Down Expand Up @@ -47,16 +48,16 @@ func (*snap) HardwareObservable() (bool, error) {
return true, nil
}

_, err = os.ReadDir("/sys/bus/pci/devices")
if err == nil {
// Hardware access is available also if the snap is installed without confinement.
// Verify by running lscpu from the system path (not staged in the snap)
if err := exec.Command("/usr/bin/lscpu", "-V").Run(); err != nil {
if errors.Is(err, os.ErrPermission) {
return false, nil
}
return false, fmt.Errorf("checking lscpu availability: %w", err)
} else {
return true, nil
}
Comment thread
farshidtz marked this conversation as resolved.

if errors.Is(err, os.ErrPermission) || os.IsPermission(err) {
return false, nil
}

return false, fmt.Errorf("reading /sys/bus/pci/devices: %w", err)
}

// InstallComponent installs a single snap component.
Expand All @@ -81,4 +82,3 @@ func (*snap) ServiceStatuses() (map[string]string, error) {
}
return statuses, nil
}

Loading