Address review comments

Signed-off-by: Mark Yen <mark.yen@suse.com>

Author: mook-as

src/rd-init/main.go

@@ -61,7 +61,7 @@ func run(ctx context.Context) error {
 	// Notify ready before we reload the other units; otherwise we end up
 	// blocking startup due to a loop with systemd-networkd.
 	if _, err := daemon.SdNotify(true, daemon.SdNotifyReady); err != nil {
-		return err
+		return fmt.Errorf("failed to notify systemd: %w", err)
 	}
 
 	seenUnits := make(map[string]bool)
@@ -75,7 +75,12 @@ func run(ctx context.Context) error {
 		if err != nil {
 			return fmt.Errorf("failed to start unit %s: %w", unit, err)
 		}
-		slog.InfoContext(ctx, "restarted systemd unit", "unit", unit, "result", <-ch)
+		select {
+		case result := <-ch:
+			slog.InfoContext(ctx, "restarted systemd unit", "unit", unit, "result", result)
+		case <-ctx.Done():
+			return fmt.Errorf("context closed while waiting for systemd unit %s: %w", unit, ctx.Err())
+		}
 	}
 
 	return nil

src/rd-init/metadata.go

@@ -10,13 +10,18 @@ import (
 	"golang.org/x/sys/unix"
 )
 
+const (
+	// Path to cloud-config style metadata file provided by Lima.
+	metadataPath = "/mnt/lima-cidata/meta-data"
+)
+
 // Load /mnt/lima-cidata/meta-data
 func LoadMetadata(ctx context.Context) ([]string, error) {
 	var metaData struct {
 		LocalHostName string `yaml:"local-hostname"`
 	}
 
-	file, err := os.Open("/mnt/lima-cidata/meta-data")
+	file, err := os.Open(metadataPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to load meta-data file: %w", err)
 	}

src/rd-init/network.go

@@ -11,6 +11,11 @@ import (
 	"github.com/goccy/go-yaml"
 )
 
+const (
+	// Path to cloud-config style networking configuration file provided by Lima.
+	networkConfigPath = "/mnt/lima-cidata/network-config"
+)
+
 var networkConfig struct {
 	Version uint `yaml:"version"`
 	Ethernets map[string]struct {
@@ -31,7 +36,7 @@ var networkConfig struct {
 
 func LoadNetworkConfig(ctx context.Context) ([]string, error) {
 	hasChanges := false
-	file, err := os.Open("/mnt/lima-cidata/network-config")
+	file, err := os.Open(networkConfigPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read network-config: %w", err)
 	}

src/rd-init/userdata.go

@@ -115,7 +115,7 @@ func LoadUserData(ctx context.Context) ([]string, error) {
 			err := os.WriteFile(
 				fmt.Sprintf("/etc/sudoers.d/90-lima-user-%s", userEntry.Name),
 				[]byte(userEntry.Name + " " + userEntry.Sudo),
-				0o644)
+				0o400)
 			if err != nil {
 				return nil, fmt.Errorf("failed to create sudoers file for %q: %w", userEntry.Name, err)
 			}
@@ -185,7 +185,7 @@ func LoadUserData(ctx context.Context) ([]string, error) {
 		if err := os.WriteFile(writeFile.Path, []byte(writeFile.Content), os.FileMode(fileMode)); err != nil {
 			return nil, fmt.Errorf("failed to write file %s: %w", writeFile.Path, err)
 		}
-		uid := int64(-1)
+		var uid int64
 		gid := int64(-1)
 		userName, groupName, _ := strings.Cut(writeFile.Owner, ":")
 		if u, err := user.Lookup(userName); err != nil {