1 files changed, 4 insertions, 2 deletions

diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc
index 2d19f3c..218cf2b 100644
--- a/images/enea-nfv-access-host-common.inc
+++ b/images/enea-nfv-access-host-common.inc
@@ -51,7 +51,9 @@ python __anonymous () {
 # Before building the OSTree image, move DPKG data to /usr/dpkg, because
 # OSTree does not preserve the contents of /var
 IMAGE_CMD_ostree_prepend () {
-    install -d ${IMAGE_ROOTFS}/usr/dpkg/
 
-    mv ${IMAGE_ROOTFS}/var/lib/dpkg/* ${IMAGE_ROOTFS}/usr/dpkg/
+    install -d ${IMAGE_ROOTFS}/usr/dpkg/
+    if [ "$(ls -A ${IMAGE_ROOTFS}/var/lib/dpkg)" ]; then
+        mv ${IMAGE_ROOTFS}/var/lib/dpkg/* ${IMAGE_ROOTFS}/usr/dpkg/
+    fi
 }