Merge pull request #56 from germag/remove-dead-code

Remove dead code

Author: rhatdan

cmd/run.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"sync"
 	"time"
 
 	"github.com/containers/podman-bootc/pkg/bootc"
@@ -68,7 +67,7 @@ func doRun(flags *cobra.Command, args []string) error {
 	}
 
 	//podman machine connection
-	machineInfo, err := utils.GetMachineInfo(user)
+	machineInfo, err := utils.GetMachineInfo()
 	if err != nil {
 		return err
 	}
@@ -159,8 +158,6 @@ func doRun(flags *cobra.Command, args []string) error {
 
 	if !vmConfig.Background {
 		if !vmConfig.Quiet {
-			var vmConsoleWg sync.WaitGroup
-			vmConsoleWg.Add(1)
 			go func() {
 				err := bootcVM.PrintConsole()
 				if err != nil {
@@ -173,8 +170,6 @@ func doRun(flags *cobra.Command, args []string) error {
 				return fmt.Errorf("WaitSshReady: %w", err)
 			}
 
-			vmConsoleWg.Done() //stop printing the VM console when SSH is ready
-
 			// the PrintConsole routine is suddenly stopped without waiting for
 			// the print buffer to be flushed, this can lead to the consoel output
 			// printing after the ssh prompt begins. Sleeping for a second

pkg/utils/podman.go

@@ -7,8 +7,6 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/containers/podman-bootc/pkg/user"
-
 	"github.com/containers/podman/v5/pkg/machine"
 	"github.com/containers/podman/v5/pkg/machine/define"
 	"github.com/containers/podman/v5/pkg/machine/env"
@@ -22,13 +20,13 @@ type MachineInfo struct {
 	Rootful         bool
 }
 
-func GetMachineInfo(user user.User) (*MachineInfo, error) {
+func GetMachineInfo() (*MachineInfo, error) {
 	minfo, err := getMachineInfo()
 	if err != nil {
 		var errIncompatibleMachineConfig *define.ErrIncompatibleMachineConfig
 		var errVMDoesNotExist *define.ErrVMDoesNotExist
 		if errors.As(err, &errIncompatibleMachineConfig) || errors.As(err, &errVMDoesNotExist) {
-			minfo, err := getPv4MachineInfo(user)
+			minfo, err := getPv4MachineInfo()
 			if err != nil {
 				return nil, err
 			}
@@ -71,7 +69,7 @@ func getMachineInfo() (*MachineInfo, error) {
 }
 
 // Just to support podman v4.9, it will be removed in the future
-func getPv4MachineInfo(user user.User) (*MachineInfo, error) {
+func getPv4MachineInfo() (*MachineInfo, error) {
 	//check if a default podman machine exists
 	listCmd := exec.Command("podman", "machine", "list", "--format", "json")
 	var listCmdOutput strings.Builder

pkg/vm/vm_linux.go

@@ -287,16 +287,6 @@ func (v *BootcVMLinux) loadExistingDomain() (err error) {
 		}
 	}
 
-	// if domain exists, load it's config
-	if v.domain != nil {
-		cfg, err := v.GetConfig()
-		if err != nil {
-			return fmt.Errorf("unable to load VM config: %w", err)
-		}
-		v.sshPort = cfg.SshPort
-		v.sshIdentity = cfg.SshIdentity
-	}
-
 	return nil
 }
 

podman-bootc.go

@@ -24,7 +24,7 @@ func cleanup() {
 	}
 
 	//podman machine connection
-	machineInfo, err := utils.GetMachineInfo(user)
+	machineInfo, err := utils.GetMachineInfo()
 	if err != nil {
 		logrus.Errorf("unable to get podman machine info: %s", err)
 		os.Exit(1)