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

[roberto.foglietta@linuxteam.org]

From: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>

image: make sure do_rootfs_finalize can run multiple times, v3

v2: essential code, only

v3: code above the fix, rationalisation

Signed-off-by: Roberto A. Foglietta <roberto.foglietta@gmail.com>
---
 meta/classes/image.bbclass | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 629a0c1..7a5ced5 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -419,15 +419,13 @@ do_rootfs_finalize() {
         mountpoint -q '${ROOTFSDIR}/sys' && \
             umount -l ${ROOTFSDIR}/sys
 
-        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list"
-        rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt"
-        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"
+        aptdir="${ROOTFSDIR}/etc/apt"
+        rm -f "${aptdir}/apt.conf.d/50isar"
+        rm -f "${aptdir}/preferences.d/isar-apt"
+        rm -f "${aptdir}/sources.list.d/isar-apt.list"
+        rm -f "${aptdir}/sources.list.d/base-apt.list"
+        mv -f "${aptdir}/sources-list" \
+            "${aptdir}/sources.list.d/bootstrap.list" 2>/dev/null || :
 EOSUDO
 }
 addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess
-- 
2.34.1