In-house Alpine builder

vm/errors.go

@@ -19,7 +19,7 @@ func wrapErrWithLog(err error, msg, log string) error {
 func getLogErrMsg(s string) string {
 	logToInclude := strings.ReplaceAll(s, "\n", "\\n")
 	logToInclude = strings.TrimSuffix(logToInclude, "\\n")
-	logToInclude = utils.ClearUnprintableChars(logToInclude)
+	logToInclude = utils.ClearUnprintableChars(logToInclude, false)
 
 	origLogLen := len(logToInclude)
 	const maxLogLen = 256

vm/ssh.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/AlexSSD7/linsk/utils"
 	"github.com/alessio/shellescape"
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/ssh"
@@ -99,14 +100,19 @@ func (vm *VM) sshSetup() (ssh.Signer, error) {
 		return nil, errors.Wrap(err, "generate ssh key")
 	}
 
-	cmd := `set -ex; do_setup () { sh -c "set -ex; ifconfig eth0 up; ifconfig lo up; udhcpc; mkdir -p ~/.ssh; echo ` + shellescape.Quote(string(sshPublicKey)) + ` > ~/.ssh/authorized_keys; rc-update add sshd; rc-service sshd start"; echo "SERIAL"" ""STATUS: $?"; }; do_setup` + "\n"
+	installSSHDCmd := ""
+	if vm.installSSH {
+		installSSHDCmd = "apk add openssh; "
+	}
+
+	cmd := `do_setup () { sh -c "set -ex; setup-alpine -q; ` + installSSHDCmd + `mkdir -p ~/.ssh; echo ` + shellescape.Quote(string(sshPublicKey)) + ` > ~/.ssh/authorized_keys; rc-update add sshd; rc-service sshd start"; echo "SERIAL"" ""STATUS: $?"; }; do_setup` + "\n"
 
 	err = vm.writeSerial([]byte(cmd))
 	if err != nil {
 		return nil, errors.Wrap(err, "write ssh setup serial command")
 	}
 
-	deadline := time.Now().Add(time.Second * 5)
+	deadline := time.Now().Add(time.Second * 30)
 
 	stdOutErrBuf := bytes.NewBuffer(nil)
 
@@ -118,7 +124,7 @@ func (vm *VM) sshSetup() (ssh.Signer, error) {
 			return nil, fmt.Errorf("setup command timed out %v", getLogErrMsg(stdOutErrBuf.String()))
 		case data := <-vm.serialStdoutCh:
 			prefix := []byte("SERIAL STATUS: ")
-			stdOutErrBuf.Write(data)
+			stdOutErrBuf.WriteString(utils.ClearUnprintableChars(string(data), true))
 			if bytes.HasPrefix(data, prefix) {
 				if len(data) == len(prefix) {
 					return nil, fmt.Errorf("setup command status code did not show up")

vm/vm.go

@@ -37,6 +37,7 @@ type VM struct {
 	sshMappedPort uint16
 	sshConf       *ssh.ClientConfig
 	sshReadyCh    chan struct{}
+	installSSH    bool
 
 	serialRead    *io.PipeReader
 	serialReader  *bufio.Reader
@@ -51,15 +52,22 @@ type VM struct {
 	canceled uint32
 }
 
+type DriveConfig struct {
+	Path         string
+	SnapshotMode bool
+}
+
 type VMConfig struct {
 	CdromImagePath string
 
 	USBDevices               []USBDevicePassthroughConfig
 	ExtraPortForwardingRules []PortForwardingRule
+	Drives                   []DriveConfig
 
-	// Debug-related options.
-	DebugUnrestrictedNetworking bool
-	DebugShowDisplay            bool
+	// Mostly debug-related options.
+	UnrestrictedNetworking bool
+	ShowDisplay            bool
+	InstallBaseUtilities   bool
 }
 
 func NewVM(logger *slog.Logger, cfg VMConfig) (*VM, error) {
@@ -81,7 +89,7 @@ func NewVM(logger *slog.Logger, cfg VMConfig) (*VM, error) {
 
 	netdevOpts := "user,id=net0,hostfwd=tcp:127.0.0.1:" + fmt.Sprint(sshPort) + "-:22"
 
-	if !cfg.DebugUnrestrictedNetworking {
+	if !cfg.UnrestrictedNetworking {
 		netdevOpts += ",restrict=on"
 	} else {
 		logger.Warn("Running with unsafe unrestricted networking")
@@ -98,9 +106,7 @@ func NewVM(logger *slog.Logger, cfg VMConfig) (*VM, error) {
 
 	cmdArgs = append(cmdArgs, "-device", "e1000,netdev=net0", "-netdev", netdevOpts)
 
-	cmdArgs = append(cmdArgs, "-drive", "file="+shellescape.Quote(cdromImagePath)+",format=qcow2,if=virtio", "-snapshot")
-
-	if !cfg.DebugShowDisplay {
+	if !cfg.ShowDisplay {
 		cmdArgs = append(cmdArgs, "-display", "none")
 	}
 
@@ -112,6 +118,28 @@ func NewVM(logger *slog.Logger, cfg VMConfig) (*VM, error) {
 		}
 	}
 
+	for i, extraDrive := range cfg.Drives {
+		_, err = os.Stat(extraDrive.Path)
+		if err != nil {
+			return nil, errors.Wrapf(err, "stat extra drive #%v path", i)
+		}
+
+		driveArgs := "file=" + shellescape.Quote(extraDrive.Path) + ",format=qcow2,if=virtio"
+		if extraDrive.SnapshotMode {
+			driveArgs += ",snapshot"
+		}
+
+		cmdArgs = append(cmdArgs, "-drive", driveArgs)
+	}
+
+	if cdromImagePath != "" {
+		cmdArgs = append(cmdArgs, "-boot", "d", "-cdrom", cdromImagePath)
+	}
+
+	if cfg.InstallBaseUtilities && !cfg.UnrestrictedNetworking {
+		return nil, fmt.Errorf("cannot install base utilities with unrestricted networking disabled")
+	}
+
 	sysRead, userWrite := io.Pipe()
 	userRead, sysWrite := io.Pipe()
 
@@ -141,6 +169,7 @@ func NewVM(logger *slog.Logger, cfg VMConfig) (*VM, error) {
 
 		sshMappedPort: uint16(sshPort),
 		sshReadyCh:    make(chan struct{}),
+		installSSH:    cfg.InstallBaseUtilities,
 
 		serialRead:   userRead,
 		serialReader: userReader,