Correct service existence check in ectl

cmd/ectl/go.mod

@@ -2,4 +2,7 @@ module ectl
 
 go 1.23.4
 
-require rsc.io/getopt v0.0.0-20170811000552-20be20937449 // indirect
+require (
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	rsc.io/getopt v0.0.0-20170811000552-20be20937449 // indirect
+)

cmd/ectl/go.sum

@@ -1,2 +1,5 @@
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 rsc.io/getopt v0.0.0-20170811000552-20be20937449 h1:UukjJOsjQH0DIuyyrcod6CXHS6cdaMMuJmrt+SN1j4A=
 rsc.io/getopt v0.0.0-20170811000552-20be20937449/go.mod h1:dhCdeqAxkyt5u3/sKRkUXuHaMXUu1Pt13GTQAM2xnig=

cmd/ectl/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"gopkg.in/yaml.v3"
 	"log"
 	"net"
 	"os"
@@ -64,8 +65,7 @@ func main() {
 			fmt.Printf("Usage: ectl service %s <service>\n", flag.Args()[1])
 			return
 		} else if flag.Args()[1] == "start" {
-			flag.Args()[2] = strings.TrimSuffix(flag.Args()[2], ".esv")
-			if _, err := os.Stat(path.Join(sysconfdir, "esvm/services/", flag.Args()[2]+".esv")); err != nil {
+			if _, err := os.Stat(path.Join(runstatedir, "esvm", flag.Args()[2])); err != nil {
 				log.Fatalf("Could not start service! Error: %s\n", err)
 			}
 
@@ -86,8 +86,7 @@ func main() {
 			fmt.Println("Service started successfully!")
 			return
 		} else if flag.Args()[1] == "stop" {
-			flag.Args()[2] = strings.TrimSuffix(flag.Args()[2], ".esv")
-			if _, err := os.Stat(path.Join(sysconfdir, "esvm/services/", flag.Args()[2]+".esv")); err != nil {
+			if _, err := os.Stat(path.Join(runstatedir, "esvm", flag.Args()[2])); err != nil {
 				log.Fatalf("Could not stop service! Error: %s\n", err)
 			}
 
@@ -107,9 +106,8 @@ func main() {
 			fmt.Println("Service stopped successfully!")
 			return
 		} else if flag.Args()[1] == "restart" || flag.Args()[1] == "reload" {
-			flag.Args()[2] = strings.TrimSuffix(flag.Args()[2], ".esv")
-			if _, err := os.Stat(path.Join(sysconfdir, "esvm/services/", flag.Args()[2]+".esv")); err != nil {
-				log.Fatalf("Could not stop service! Error: %s\n", err)
+			if _, err := os.Stat(path.Join(runstatedir, "esvm", flag.Args()[2])); err != nil {
+				log.Fatalf("Could not restart service! Error: %s\n", err)
 			}
 
 			_, err := socket.Write([]byte("restart " + flag.Args()[2]))
@@ -127,10 +125,105 @@ func main() {
 			}
 			fmt.Println("Service restarted successfully!")
 			return
+		} else if flag.Args()[1] == "enable" {
+			// Check if service exists
+			found := false
+			entries, err := os.ReadDir(path.Join(sysconfdir, "esvm/services/"))
+			if err != nil {
+				log.Fatalf("Could not enable service! Error: %s\n", err)
+			}
+			type minimalServiceStruct struct {
+				Name string `yaml:"name"`
+			}
+			for _, entry := range entries {
+				if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".esv") {
+					continue
+				}
+
+				bytes, err := os.ReadFile(path.Join(sysconfdir, "esvm/services", entry.Name()))
+				if err != nil {
+					log.Fatalf("Could not enable service! Error: %s\n", err)
+				}
+
+				sv := minimalServiceStruct{Name: ""}
+				err = yaml.Unmarshal(bytes, &sv)
+				if err != nil {
+					log.Fatalf("Could not enable service! Error: %s\n", err)
+				}
+
+				if sv.Name == flag.Args()[2] {
+					found = true
+					break
+				}
+			}
+			if !found {
+				log.Fatalf("Service does not exist!")
+			}
+
+			if _, err := os.Stat(path.Join(sysconfdir, "esvm/enabled_services")); err != nil {
+				err := os.WriteFile(path.Join(sysconfdir, "esvm/enabled_services"), []byte(flag.Args()[2]+"\n"), 0644)
+				if err != nil {
+					log.Fatalf("Could not enable service! Error: %s\n", err)
+				}
+				return
+			}
+
+			file, err := os.ReadFile(path.Join(sysconfdir, "esvm/enabled_services"))
+			if err != nil {
+				log.Fatalf("Could not enable service! Error: %s\n", err)
+			}
+			for _, line := range strings.Split(string(file), "\n") {
+				if strings.TrimSpace(line) == flag.Args()[2] {
+					fmt.Println("Service is already enabled!")
+					return
+				}
+			}
+
+			err = os.WriteFile(path.Join(sysconfdir, "esvm/enabled_services"), []byte(string(file)+flag.Args()[2]+"\n"), 0644)
+			if err != nil {
+				log.Fatalf("Could not enable service! Error: %s\n", err)
+			}
+
+			fmt.Printf("Service (%s) has been enabled!\n", flag.Args()[2])
+			return
+		} else if flag.Args()[1] == "disable" {
+			if _, err := os.Stat(path.Join(sysconfdir, "esvm/enabled_services")); err != nil {
+				fmt.Println("Service is already disabled!")
+				return
+			}
+
+			file, err := os.ReadFile(path.Join(sysconfdir, "esvm/enabled_services"))
+			if err != nil {
+				log.Fatalf("Could not disable service! Error: %s\n", err)
+			}
+
+			lines := strings.Split(string(file), "\n")
+			found := false
+			for i := len(lines) - 1; i >= 0; i-- {
+				line := strings.TrimSpace(lines[i])
+				if strings.TrimSpace(line) == flag.Args()[2] {
+					lines = append(lines[:i], lines[i+1:]...)
+					found = true
+				} else if strings.TrimSpace(line) == "" {
+					lines = append(lines[:i], lines[i+1:]...)
+				}
+			}
+
+			if !found {
+				fmt.Println("Service is already disabled!")
+				return
+			}
+
+			err = os.WriteFile(path.Join(sysconfdir, "esvm/enabled_services"), []byte(strings.Join(lines, "\n")+"\n"), 0644)
+			if err != nil {
+				log.Fatalf("Could not disable service! Error: %s\n", err)
+			}
+
+			fmt.Printf("Service (%s) has been disabled!\n", flag.Args()[2])
+			return
 		} else if flag.Args()[1] == "status" {
-			flag.Args()[2] = strings.TrimSuffix(flag.Args()[2], ".esv")
-			if _, err := os.Stat(path.Join(sysconfdir, "esvm/services/", flag.Args()[2]+".esv")); err != nil {
-				log.Fatalf("Could not stop service! Error: %s\n", err)
+			if _, err := os.Stat(path.Join(runstatedir, "esvm", flag.Args()[2])); err != nil {
+				log.Fatalf("Could not get service status! Error: %s\n", err)
 			}
 
 			var state uint64

cmd/enit/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"log"
@@ -8,6 +9,7 @@ import (
 	"os/exec"
 	"os/signal"
 	"path"
+	"strings"
 	"syscall"
 	"time"
 )
@@ -40,6 +42,8 @@ func main() {
 	mountVirtualFilesystems()
 	// Mount filesystems in fstab
 	mountFilesystems()
+	// Set hostname
+	setHostname()
 	// Start service manager
 	startServiceManager()
 
@@ -73,14 +77,14 @@ func mountVirtualFilesystems() {
 		panic(err)
 	}
 	// Mount /dev/pts
-	if err := os.Mkdir("/dev/pts", 0755); err != nil {
+	if err := os.Mkdir("/dev/pts", 0755); err != nil && !errors.Is(err, os.ErrExist) {
 		panic(err)
 	}
 	if err := syscall.Mount("devpts", "/dev/pts", "devpts", commonFlags, "gid=5,mode=620,ptmxmode=000"); err != nil {
 		panic(err)
 	}
 	// Mount /dev/shm
-	if err := os.Mkdir("/dev/shm", 0755); err != nil {
+	if err := os.Mkdir("/dev/shm", 0755); err != nil && !errors.Is(err, os.ErrExist) {
 		panic(err)
 	}
 	if err := syscall.Mount("shm", "/dev/shm", "tmpfs", commonFlags|syscall.MS_NODEV, "inode64"); err != nil {
@@ -116,6 +120,8 @@ func startServiceManager() {
 	fmt.Print("Initializing service manager... ")
 
 	cmd := exec.Command("/sbin/esvm", path.Join(runstatedir, "esvm"), path.Join(sysconfdir, "esvm"))
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
 	err := cmd.Start()
 	if err != nil {
 		log.Println("Could not initialize service manager!")
@@ -165,6 +171,25 @@ func stopServiceManager() {
 	fmt.Println("Done.")
 }
 
+func setHostname() {
+	fmt.Print("Setting hostname... ")
+
+	bytes, err := os.ReadFile("/etc/hostname")
+	if err != nil {
+		log.Println("Could not set hostname!")
+		return
+	}
+
+	hostname := strings.TrimSpace(string(bytes))
+
+	if err := syscall.Sethostname([]byte(hostname)); err != nil {
+		log.Println("Could not set hostname!")
+		return
+	}
+
+	fmt.Println("Done.")
+}
+
 func waitZombieProcesses() {
 	for {
 		if wpid, _ := syscall.Wait4(-1, nil, syscall.WNOHANG, nil); wpid <= 0 {

cmd/esvm/main.go

@@ -11,6 +11,7 @@ import (
 	"os/exec"
 	"os/signal"
 	"path"
+	"slices"
 	"strconv"
 	"strings"
 	"syscall"
@@ -29,17 +30,18 @@ const (
 )
 
 type EnitService struct {
-	Name           string   `yaml:"name"`
-	Description    string   `yaml:"description,omitempty"`
-	Dependencies   []string `yaml:"dependencies,omitempty"`
-	Type           string   `yaml:"type"`
-	StartCmd       string   `yaml:"start_cmd"`
-	ExitMethod     string   `yaml:"exit_method"`
-	StopCmd        string   `yaml:"stop_cmd,omitempty"`
-	Restart        bool     `yaml:"restart,omitempty"`
-	ServiceRunPath string
-	restartCount   int
-	stopChannel    chan bool
+	Name            string   `yaml:"name"`
+	Description     string   `yaml:"description,omitempty"`
+	Dependencies    []string `yaml:"dependencies,omitempty"`
+	Type            string   `yaml:"type"`
+	StartCmd        string   `yaml:"start_cmd"`
+	ExitMethod      string   `yaml:"exit_method"`
+	CrashOnSafeExit bool     `yaml:"crash_on_safe_exit"`
+	StopCmd         string   `yaml:"stop_cmd,omitempty"`
+	Restart         string   `yaml:"restart,omitempty"`
+	ServiceRunPath  string
+	restartCount    int
+	stopChannel     chan bool
 }
 
 // Build-time variables
@@ -49,6 +51,7 @@ var runtimeServiceDir string
 var serviceConfigDir string
 
 var Services = make([]EnitService, 0)
+var EnabledServices = make([]string, 0)
 
 var logger *log.Logger
 var socket net.Listener
@@ -137,23 +140,30 @@ func Init() {
 			}
 
 			service := EnitService{
-				Name:           "",
-				Description:    "",
-				Dependencies:   make([]string, 0),
-				Type:           "",
-				StartCmd:       "",
-				ExitMethod:     "",
-				StopCmd:        "",
-				Restart:        false,
-				ServiceRunPath: "",
-				restartCount:   0,
-				stopChannel:    make(chan bool),
+				Name:            "",
+				Description:     "",
+				Dependencies:    make([]string, 0),
+				Type:            "",
+				StartCmd:        "",
+				ExitMethod:      "",
+				StopCmd:         "",
+				Restart:         "",
+				CrashOnSafeExit: true,
+				ServiceRunPath:  "",
+				restartCount:    0,
+				stopChannel:     make(chan bool),
 			}
 			if err := yaml.Unmarshal(bytes, &service); err != nil {
 				logger.Printf("Could not read service file at %s!\n", path.Join(serviceConfigDir, "services", entry.Name()))
 				continue
 			}
 
+			for _, sv := range Services {
+				if sv.Name == service.Name {
+					logger.Printf("Service with name (%s) has already been initialized!", service.Name)
+				}
+			}
+
 			switch service.Type {
 			case "simple", "background":
 			default:
@@ -168,6 +178,12 @@ func Init() {
 				continue
 			}
 
+			switch service.Restart {
+			case "true", "always":
+			default:
+				service.Restart = "false"
+			}
+
 			service.ServiceRunPath = path.Join(runtimeServiceDir, service.Name)
 			err = os.MkdirAll(path.Join(service.ServiceRunPath), 0755)
 			if err != nil {
@@ -185,15 +201,28 @@ func Init() {
 		}
 	}
 
-	// Get services that meet their dependencies
+	// Get enabled services
+	if _, err := os.Stat(path.Join(serviceConfigDir, "enabled_services")); err == nil {
+		file, err := os.ReadFile(path.Join(serviceConfigDir, "enabled_services"))
+		if err != nil {
+			return
+		}
+		for _, line := range strings.Split(string(file), "\n") {
+			if line != "" {
+				EnabledServices = append(EnabledServices, line)
+			}
+		}
+	}
+
+	// Get enabled services that meet their dependencies
 	servicesWithMetDepends := make([]EnitService, 0)
 	for _, service := range Services {
-		if len(service.GetUnmetDependencies()) == 0 {
+		if slices.Contains(EnabledServices, service.Name) && len(service.GetUnmetDependencies()) == 0 {
 			servicesWithMetDepends = append(servicesWithMetDepends, service)
 		}
 	}
 
-	// Loop until all services have started or timed out
+	// Loop until all enabled services have started or timed out
 	for start := time.Now(); time.Since(start) < 60*time.Second; {
 		if len(servicesWithMetDepends) == 0 {
 			break
@@ -340,10 +369,17 @@ func (service *EnitService) StartService() error {
 				_ = service.setCurrentState(EnitServiceCompleted)
 				return
 			}
-			logger.Printf("Service (%s) has crashed!\n", service.Name)
-			_ = service.setCurrentState(EnitServiceCrashed)
+			if !service.CrashOnSafeExit {
+				logger.Printf("Service (%s) has exited\n", service.Name)
+				_ = service.setCurrentState(EnitServiceStopped)
+			} else {
+				logger.Printf("Service (%s) has crashed!\n", service.Name)
+				_ = service.setCurrentState(EnitServiceCrashed)
+			}
 
-			if service.Restart && service.restartCount < 5 {
+			if service.Restart == "always" {
+				_ = service.StartService()
+			} else if service.Restart == "true" && service.restartCount < 5 {
 				service.restartCount++
 				_ = service.StartService()
 			}

services/agetty-tty1.esv

@@ -1,5 +1,7 @@
 name: agetty-tty1
 description: Start virtual terminal on tty1
 type: background
-start_cmd: /sbin/agetty --noclear tty1
+start_cmd: /usr/bin/setsid /sbin/agetty --noclear tty1
 exit_method: kill
+crash_on_safe_exit: false
+restart: always

services/agetty-tty2.esv

@@ -1,5 +1,7 @@
 name: agetty-tty2
 description: Start virtual terminal on tty2
 type: background
-start_cmd: /sbin/agetty --noclear tty2
+start_cmd: /usr/bin/setsid /sbin/agetty tty2
 exit_method: kill
+crash_on_safe_exit: false
+restart: always

services/agetty-tty3.esv

@@ -1,5 +1,7 @@
 name: agetty-tty3
 description: Start virtual terminal on tty3
 type: background
-start_cmd: /sbin/agetty --noclear tty3
+start_cmd: /usr/bin/setsid /sbin/agetty tty3
 exit_method: kill
+crash_on_safe_exit: false
+restart: always

services/agetty-tty4.esv

@@ -1,5 +1,7 @@
 name: agetty-tty4
 description: Start virtual terminal on tty4
 type: background
-start_cmd: /sbin/agetty --noclear tty4
+start_cmd: /usr/bin/setsid /sbin/agetty tty4
 exit_method: kill
+crash_on_safe_exit: false
+restart: always

services/agetty-tty5.esv

@@ -1,5 +1,7 @@
 name: agetty-tty5
 description: Start virtual terminal on tty5
 type: background
-start_cmd: /sbin/agetty --noclear tty5
+start_cmd: /usr/bin/setsid /sbin/agetty tty5
 exit_method: kill
+crash_on_safe_exit: false
+restart: always

services/agetty-tty6.esv

@@ -1,5 +1,7 @@
 name: agetty-tty6
 description: Start virtual terminal on tty6
 type: background
-start_cmd: /sbin/agetty --noclear tty6
+start_cmd: /usr/bin/setsid /sbin/agetty tty6
 exit_method: kill
+crash_on_safe_exit: false
+restart: always