From 66ec7d214e7937f67362151ebcae336d6d54edb6 Mon Sep 17 00:00:00 2001
From: Karol Lewandowski <k.lewandowsk@samsung.com>
Date: Fri, 1 Sep 2023 11:02:31 +0200
Subject: [PATCH] generator: Move mount unit to separate isu.conf

Having isu.conf (always) will make it easier to detect if service uses ISU
or not.

Change-Id: I9e4cb46db7d1114ce1760c21f143f4a6997b3428
---
 src/systemd_generator/isu-generator | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/systemd_generator/isu-generator b/src/systemd_generator/isu-generator
index 7ffbf35..b683e10 100755
--- a/src/systemd_generator/isu-generator
+++ b/src/systemd_generator/isu-generator
@@ -63,7 +63,9 @@ Where=${RUNDIR}/${isu_pkg_name}/rootfs
 EOF
 	fi
 
-	cat <<EOF >> "$new_srv_path".tmp || return 1
+	local confd="${new_srv_path}.d"
+	mkdir -p "${confd}"
+	cat <<EOF >> "$confd/isu.conf.tmp" || return 1
 
 [Unit]
 After=${mount_unit}
@@ -71,7 +73,10 @@ BindsTo=${mount_unit}
 EOF
 
 	# make new unit visible
-	mv "${new_srv_path}.tmp" "${new_srv_path}" || return 1
+	mv "${confd}/isu.conf.tmp" "${confd}/isu.conf" || return 1
+	if ! mv "${new_srv_path}.tmp" "${new_srv_path}"; then
+		mv "${confd}/isu.conf" "${confd}/isu.conf.revert" || :
+	fi
 
 	return 0
 }
-- 
2.34.1