Use process group IDs for terminating service subprocesses

services/agetty-tty1.esv

@@ -4,4 +4,5 @@ type: background
 start_cmd: /usr/bin/setsid /sbin/agetty --noclear tty1
 exit_method: kill
 crash_on_safe_exit: false
-restart: always
+restart: always
+setpgid: false

services/agetty-tty2.esv

@@ -4,4 +4,5 @@ type: background
 start_cmd: /usr/bin/setsid /sbin/agetty tty2
 exit_method: kill
 crash_on_safe_exit: false
-restart: always
+restart: always
+setpgid: false

services/agetty-tty3.esv

@@ -4,4 +4,5 @@ type: background
 start_cmd: /usr/bin/setsid /sbin/agetty tty3
 exit_method: kill
 crash_on_safe_exit: false
-restart: always
+restart: always
+setpgid: false

services/agetty-tty4.esv

@@ -4,4 +4,5 @@ type: background
 start_cmd: /usr/bin/setsid /sbin/agetty tty4
 exit_method: kill
 crash_on_safe_exit: false
-restart: always
+restart: always
+setpgid: false

services/agetty-tty5.esv

@@ -4,4 +4,5 @@ type: background
 start_cmd: /usr/bin/setsid /sbin/agetty tty5
 exit_method: kill
 crash_on_safe_exit: false
-restart: always
+restart: always
+setpgid: false

services/agetty-tty6.esv

@@ -4,4 +4,5 @@ type: background
 start_cmd: /usr/bin/setsid /sbin/agetty tty6
 exit_method: kill
 crash_on_safe_exit: false
-restart: always
+restart: always
+setpgid: false

src/esvm/main.go

@@ -152,6 +152,7 @@ func Init() {
 				ExitMethod:       "",
 				StopCmd:          "",
 				Restart:          "",
+				Setpgid:          true,
 				CrashOnSafeExit:  true,
 				LogOutput:        true,
 				Filepath:         path.Join(serviceConfigDir, "services", entry.Name()),

src/esvm/service.go

@@ -48,6 +48,7 @@ type EnitService struct {
 	StopCmd          string   `yaml:"stop_cmd,omitempty"`
 	Restart          string   `yaml:"restart,omitempty"`
 	ReadyFd          int      `yaml:"ready_fd"`
+	Setpgid          bool     `yaml:"setpgid"`
 	LogOutput        bool     `yaml:"log_output,omitempty"`
 	Filepath         string
 	filepathChecksum [32]byte
@@ -157,6 +158,7 @@ func (service *EnitService) ReloadService() {
 		ExitMethod:       "",
 		StopCmd:          "",
 		Restart:          "",
+		Setpgid:          true,
 		CrashOnSafeExit:  true,
 		LogOutput:        true,
 		Filepath:         service.Filepath,
@@ -225,6 +227,7 @@ func (service *EnitService) StartService() (err error) {
 	}
 
 	cmd := exec.Command("/bin/sh", "-c", "exec "+service.StartCmd)
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: service.Setpgid, Pgid: 0}
 	if logFile != nil {
 		cmd.Stdout = logFile
 		cmd.Stderr = logFile
@@ -278,8 +281,8 @@ func (service *EnitService) StartService() (err error) {
 				logFile.Close()
 			}
 
-			// Kill process
+			// Kill process and children
-			cmd.Process.Kill()
+			syscall.Kill(-service.processID, syscall.SIGKILL)
 
 			service.processID = 0
 			service.state = EnitServiceCrashed
@@ -302,6 +305,9 @@ func (service *EnitService) StartService() (err error) {
 		case <-service.stopChannel:
 			service.restartCount = 0
 		default:
+			// Kill remaining child processes
+			syscall.Kill(-service.processID, syscall.SIGKILL)
+
 			if service.Type == "simple" && err == nil {
 				service.restartCount = 0
 				if service.ExitMethod != "stop_command" {
@@ -363,9 +369,13 @@ func (service *EnitService) StopService() error {
 	}
 
 	logger.Printf("Stopping service (%s)...", service.Name)
+	pid := service.processID
 
 	newServiceStatus := EnitServiceCrashed
 	defer func() {
+		// Kill remaining child processes
+		syscall.Kill(-pid, syscall.SIGKILL)
+
 		service.state = newServiceStatus
 		service.processID = 0