mirror of
https://github.com/Control-D-Inc/ctrld.git
synced 2026-07-04 01:07:49 +02:00
Revert ignoring SIGCHLD
Using signal.Ignore causes exec.Command failed with no child process error.
This commit is contained in:
committed by
Cuong Manh Le
parent
6c55d8f139
commit
21c8b9f8e7
@@ -159,9 +159,8 @@ func (s *ddwrtSvc) Run() (err error) {
|
|||||||
|
|
||||||
if interactice, _ := isInteractive(); !interactice {
|
if interactice, _ := isInteractive(); !interactice {
|
||||||
signal.Ignore(syscall.SIGHUP)
|
signal.Ignore(syscall.SIGHUP)
|
||||||
signal.Ignore(sigCHLD)
|
|
||||||
}
|
}
|
||||||
var sigChan = make(chan os.Signal, 2)
|
var sigChan = make(chan os.Signal, 1)
|
||||||
signal.Notify(sigChan, syscall.SIGTERM, os.Interrupt)
|
signal.Notify(sigChan, syscall.SIGTERM, os.Interrupt)
|
||||||
<-sigChan
|
<-sigChan
|
||||||
|
|
||||||
|
|||||||
@@ -172,10 +172,9 @@ func (s *merlinSvc) Run() (err error) {
|
|||||||
|
|
||||||
if interactice, _ := isInteractive(); !interactice {
|
if interactice, _ := isInteractive(); !interactice {
|
||||||
signal.Ignore(syscall.SIGHUP)
|
signal.Ignore(syscall.SIGHUP)
|
||||||
signal.Ignore(sigCHLD)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var sigChan = make(chan os.Signal, 3)
|
var sigChan = make(chan os.Signal, 1)
|
||||||
signal.Notify(sigChan, syscall.SIGTERM, os.Interrupt)
|
signal.Notify(sigChan, syscall.SIGTERM, os.Interrupt)
|
||||||
<-sigChan
|
<-sigChan
|
||||||
|
|
||||||
|
|||||||
@@ -170,7 +170,6 @@ func (s *ubiosSvc) Run() (err error) {
|
|||||||
|
|
||||||
if interactice, _ := isInteractive(); !interactice {
|
if interactice, _ := isInteractive(); !interactice {
|
||||||
signal.Ignore(syscall.SIGHUP)
|
signal.Ignore(syscall.SIGHUP)
|
||||||
signal.Ignore(sigCHLD)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var sigChan = make(chan os.Signal, 3)
|
var sigChan = make(chan os.Signal, 3)
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
//go:build !windows
|
|
||||||
|
|
||||||
package router
|
|
||||||
|
|
||||||
import "syscall"
|
|
||||||
|
|
||||||
const sigCHLD = syscall.SIGCHLD
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package router
|
|
||||||
|
|
||||||
import "syscall"
|
|
||||||
|
|
||||||
const sigCHLD = syscall.SIGHUP
|
|
||||||
Reference in New Issue
Block a user