Merge pull request #10595 from boaz0/closes_10539

Add podman-restart systemd unit file

1 files changed, 7 insertions, 2 deletions

diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 5a953c047..e6dd19e63 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -702,7 +702,9 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 	reports := []*entities.ContainerStartReport{}
 	var exitCode = define.ExecErrorCodeGeneric
 	containersNamesOrIds := namesOrIds
+	all := options.All
 	if len(options.Filters) > 0 {
+		all = false
 		filterFuncs := make([]libpod.ContainerFilter, 0, len(options.Filters))
 		if len(options.Filters) > 0 {
 			for k, v := range options.Filters {
@@ -719,6 +721,10 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 		}
 		containersNamesOrIds = []string{}
 		for _, candidate := range candidates {
+			if options.All {
+				containersNamesOrIds = append(containersNamesOrIds, candidate.ID())
+				continue
+			}
 			for _, nameOrID := range namesOrIds {
 				if nameOrID == candidate.ID() || nameOrID == candidate.Name() {
 					containersNamesOrIds = append(containersNamesOrIds, nameOrID)
@@ -726,8 +732,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 			}
 		}
 	}
-
-	ctrs, rawInputs, err := getContainersAndInputByContext(options.All, options.Latest, containersNamesOrIds, ic.Libpod)
+	ctrs, rawInputs, err := getContainersAndInputByContext(all, options.Latest, containersNamesOrIds, ic.Libpod)
 	if err != nil {
 		return nil, err
 	}