4 files changed, 7 insertions, 31 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index 1c1a7c3e3..d28becc8a 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -299,7 +299,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions,
 		logDriverFlagName := "log-driver"
 		createFlags.StringVar(
 			&cf.LogDriver,
-			logDriverFlagName, logDriver(),
+			logDriverFlagName, LogDriver(),
 			"Logging driver for the container",
 		)
 		_ = cmd.RegisterFlagCompletionFunc(logDriverFlagName, AutocompleteLogDriver)
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go
index 16f193b03..c40d1ea51 100644
--- a/cmd/podman/common/create_opts.go
+++ b/cmd/podman/common/create_opts.go
@@ -530,7 +530,7 @@ func volumes() []string {
 	return nil
 }
 
-func logDriver() string {
+func LogDriver() string {
 	if !registry.IsRemote() {
 		return containerConfig.Containers.LogDriver
 	}
diff --git a/cmd/podman/machine/machine.go b/cmd/podman/machine/machine.go
index 4c566b11f..cf7542389 100644
--- a/cmd/podman/machine/machine.go
+++ b/cmd/podman/machine/machine.go
@@ -26,7 +26,6 @@ var (
 	// Pull in configured json library
 	json = registry.JSONLibrary()
 
-	sockPaths     []string   // Paths to unix domain sockets for publishing
 	openEventSock sync.Once  // Singleton support for opening sockets as needed
 	sockets       []net.Conn // Opened sockets, if any
 
@@ -35,7 +34,7 @@ var (
 		Use:                "machine",
 		Short:              "Manage a virtual machine",
 		Long:               "Manage a virtual machine. Virtual machines are used to run Podman.",
-		PersistentPreRunE:  initMachineEvents,
+		PersistentPreRunE:  validate.NoOp,
 		PersistentPostRunE: closeMachineEvents,
 		RunE:               validate.SubCommandExists,
 	}
@@ -79,17 +78,10 @@ func getMachines(toComplete string) ([]string, cobra.ShellCompDirective) {
 	return suggestions, cobra.ShellCompDirectiveNoFileComp
 }
 
-func initMachineEvents(cmd *cobra.Command, _ []string) error {
-	logrus.Debugf("Called machine %s.PersistentPreRunE(%s)", cmd.Name(), strings.Join(os.Args, " "))
-
+func initMachineEvents() {
 	sockPaths, err := resolveEventSock()
 	if err != nil {
-		return err
-	}
-
-	// No sockets found, so no need to publish events...
-	if len(sockPaths) == 0 {
-		return nil
+		logrus.Warnf("Failed to resolve machine event sockets, machine events will not be published: %v", err)
 	}
 
 	for _, path := range sockPaths {
@@ -101,7 +93,6 @@ func initMachineEvents(cmd *cobra.Command, _ []string) error {
 		logrus.Debugf("Machine event socket %q found", path)
 		sockets = append(sockets, conn)
 	}
-	return nil
 }
 
 func resolveEventSock() ([]string, error) {
@@ -145,22 +136,7 @@ func resolveEventSock() ([]string, error) {
 }
 
 func newMachineEvent(status events.Status, event events.Event) {
-	openEventSock.Do(func() {
-		// No sockets where found, so no need to publish events...
-		if len(sockPaths) == 0 {
-			return
-		}
-
-		for _, path := range sockPaths {
-			conn, err := (&net.Dialer{}).DialContext(registry.Context(), "unix", path)
-			if err != nil {
-				logrus.Warnf("Failed to open event socket %q: %v", path, err)
-				continue
-			}
-			logrus.Debugf("Machine event socket %q found", path)
-			sockets = append(sockets, conn)
-		}
-	})
+	openEventSock.Do(initMachineEvents)
 
 	event.Status = status
 	event.Time = time.Now()
diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go
index 40d14a609..3be7396ce 100644
--- a/cmd/podman/play/kube.go
+++ b/cmd/podman/play/kube.go
@@ -87,7 +87,7 @@ func init() {
 	_ = kubeCmd.RegisterFlagCompletionFunc(staticIPFlagName, completion.AutocompleteNone)
 
 	logDriverFlagName := "log-driver"
-	flags.StringVar(&kubeOptions.LogDriver, logDriverFlagName, "", "Logging driver for the container")
+	flags.StringVar(&kubeOptions.LogDriver, logDriverFlagName, common.LogDriver(), "Logging driver for the container")
 	_ = kubeCmd.RegisterFlagCompletionFunc(logDriverFlagName, common.AutocompleteLogDriver)
 
 	logOptFlagName := "log-opt"