From 9b12b522b17ccdf8eeff46017dee298eb92dd1ea Mon Sep 17 00:00:00 2001
From: Riyad Preukschas <riyad@informatik.uni-bremen.de>
Date: Thu, 29 Dec 2022 21:05:14 +0100
Subject: [PATCH] Remove `ExecStartPre` from generated services

see https://github.com/containers/podman/pull/16713
---
 src/main.rs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 6b0d32c..532ccd4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -220,15 +220,6 @@ fn convert_container(container: &SystemdUnit) -> Result<SystemdUnit, ConversionE
         "%t/containers",
     );
 
-    // Remove any leftover cid file before starting, just to be sure.
-    // We remove any actual pre-existing container by name with --replace=true.
-    // But --cidfile will fail if the target exists.
-    service.append_entry(
-        SERVICE_SECTION,
-        "ExecStartPre",
-        "-rm -f %t/%N.cid",
-    );
-
     // If the conman exited uncleanly it may not have removed the container, so force it,
     // -i makes it ignore non-existing files.
     service.append_entry(
@@ -257,9 +248,6 @@ fn convert_container(container: &SystemdUnit) -> Result<SystemdUnit, ConversionE
     // On clean shutdown, remove container
     podman.add("--rm");
 
-    // Detach from container, we don't need the podman process to hang around
-    podman.add("-d");
-
     // But we still want output to the journal, so use the log driver.
     podman.add_slice(&["--log-driver", "passthrough"]);