Merge "services/device/internal/suid: don't complain if the app shutdown"
diff --git a/services/device/internal/suid/system.go b/services/device/internal/suid/system.go
index 3e76d82..c647558 100644
--- a/services/device/internal/suid/system.go
+++ b/services/device/internal/suid/system.go
@@ -119,14 +119,16 @@
func (hw *WorkParameters) Kill() error {
for _, pid := range hw.killPids {
- proc, err := os.FindProcess(pid)
- if err != nil {
- return verror.New(errFindProcessFailed, nil, pid, err)
- }
- if err = proc.Kill(); err != nil {
+ switch err := syscall.Kill(pid, 9); err {
+ case syscall.ESRCH:
+ // No such PID.
+ log.Printf("process pid %d already killed", pid)
+ default:
+ // Something went wrong.
return verror.New(errKillFailed, nil, pid, err)
}
+
}
return nil
}
