1 files changed, 12 insertions, 6 deletions
diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go
index 5254d50cf..b1e31566f 100644
--- a/cmd/podman/machine/list.go
+++ b/cmd/podman/machine/list.go
@@ -4,6 +4,7 @@
 package machine
 
 import (
+	"fmt"
 	"os"
 	"sort"
 	"strconv"
@@ -17,7 +18,6 @@ import (
 	"github.com/containers/podman/v4/cmd/podman/validate"
 	"github.com/containers/podman/v4/pkg/machine"
 	"github.com/docker/go-units"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -27,6 +27,7 @@ var (
 		Aliases:           []string{"ls"},
 		Short:             "List machines",
 		Long:              "List managed virtual machines.",
+		PersistentPreRunE: rootlessOnly,
 		RunE:              list,
 		Args:              validate.NoArgs,
 		ValidArgsFunction: completion.AutocompleteNone,
@@ -48,6 +49,7 @@ type ListReporter struct {
 	Default        bool
 	Created        string
 	Running        bool
+	Starting       bool
 	LastUp         string
 	Stream         string
 	VMType         string
@@ -87,7 +89,7 @@ func list(cmd *cobra.Command, args []string) error {
 	provider := GetSystemDefaultProvider()
 	listResponse, err = provider.List(opts)
 	if err != nil {
-		return errors.Wrap(err, "error listing vms")
+		return fmt.Errorf("listing vms: %w", err)
 	}
 
 	// Sort by last run
@@ -137,7 +139,7 @@ func outputTemplate(cmd *cobra.Command, responses []*ListReporter) error {
 	switch {
 	case cmd.Flags().Changed("format"):
 		row = cmd.Flag("format").Value.String()
-		listFlag.noHeading = !report.HasTable(row)
+		printHeader = report.HasTable(row)
 		row = report.NormalizeFormat(row)
 	default:
 		row = cmd.Flag("format").Value.String()
@@ -156,7 +158,7 @@ func outputTemplate(cmd *cobra.Command, responses []*ListReporter) error {
 	defer w.Flush()
 	if printHeader {
 		if err := tmpl.Execute(w, headers); err != nil {
-			return errors.Wrapf(err, "failed to write report column headers")
+			return fmt.Errorf("failed to write report column headers: %w", err)
 		}
 	}
 	return tmpl.Execute(w, responses)
@@ -224,10 +226,14 @@ func toHumanFormat(vms []*machine.ListResponse) ([]*ListReporter, error) {
 		} else {
 			response.Name = vm.Name
 		}
-		if vm.Running {
+		switch {
+		case vm.Running:
 			response.LastUp = "Currently running"
 			response.Running = true
-		} else {
+		case vm.Starting:
+			response.LastUp = "Currently starting"
+			response.Starting = true
+		default:
 			response.LastUp = units.HumanDuration(time.Since(vm.LastUp)) + " ago"
 		}
 		response.Created = units.HumanDuration(time.Since(vm.CreatedAt)) + " ago"