diff mbox series

[v2] image: make sure do_rootfs_finalize can run multiple times, v2

Message ID 20230106131106.3266668-1-roberto.foglietta@linuxteam.org
State Superseded, archived
Headers show
Series [v2] image: make sure do_rootfs_finalize can run multiple times, v2 | expand

Commit Message

roberto.foglietta@linuxteam.org Jan. 6, 2023, 1:11 p.m. UTC 
From: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>

image: make sure do_rootfs_finalize can run multiple times, v2

v2: essential code, only

Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>
---
 meta/classes/image.bbclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 629a0c1..b7a7900 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -424,10 +424,8 @@  do_rootfs_finalize() {
         rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list"
         rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar"
 
-        mv "${ROOTFSDIR}/etc/apt/sources-list" \
-            "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list"
-
-        rm -f "${ROOTFSDIR}/etc/apt/sources-list"
+        mv  -f "${ROOTFSDIR}/etc/apt/sources-list" \
+            "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" || :
 EOSUDO
 }
 addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess