Merge pull request #156 from endlessm/T35244-dpkg-db-query

Fix dpkg queries

config/defaults.ini

@@ -132,6 +132,7 @@ hooks_add =
   70-flatpak-appstream-catalog
   70-flatpak-manifest
   70-ostree-manifest
+  70-packages-manifest
   80-ldconfig-aux-cache.chroot
 
 # Gzip compression by default (valid choices: gz or xz)

helpers/packages-manifest → hooks/image/70-packages-manifest

@@ -12,7 +12,7 @@ apt_pkg.init()
 
 # Use the dpkg status file from the ostree deployment
 dpkg_status = os.path.join(os.environ['OSTREE_DEPLOYMENT'],
-                           'var/lib/dpkg/status')
+                           'usr/share/dpkg/database/status')
 apt_pkg.config.set('Dir::State::status', dpkg_status)
 
 # Open an apt Cache and output data for each installed package
@@ -35,5 +35,9 @@ for pkg in sorted(cache):
         'size': pkg.installed.installed_size,
     }
 
-# Print out the json
-print(json.dumps(data, sort_keys=True))
+# Now write out the json to a fragment
+manifestdir = os.environ['EIB_MANIFESTDIR']
+manifest_path = os.path.join(manifestdir, 'packages.json')
+print('Writing packages manifest info to', manifest_path)
+with open(manifest_path, 'w') as manifest:
+    json.dump(data, manifest, sort_keys=True)

stages/eib_image

@@ -155,17 +155,12 @@ if [[ "${EIB_IMAGE_SDBOOT}" = "true" ]]; then
   unset sdboot_esp_img_loop
 fi
 
-# Output package list using the dpkg database from the deployment's /var
-dpkgdir="${OSTREE_DEPLOYMENT}"/var/lib/dpkg
+# Output package list using the dpkg database from the deployment's
+# immutable copy in /usr/share/dpkg/database.
+dpkgdir="${OSTREE_DEPLOYMENT}"/usr/share/dpkg/database
 packageinfo="${EIB_TMPDIR}"/packages.txt
 dpkg-query -W --admindir="${dpkgdir}" > "${packageinfo}"
 
-# Add package info to manifest using helper. This needs to be run here
-# rather than in an image hook because the dpkg database will be masked
-# by the OS /var mount.
-pkg_manifest="${EIB_MANIFESTDIR}"/packages.json
-"${EIB_HELPERSDIR}"/packages-manifest > "${pkg_manifest}"
-
 run_hooks content "${OSTREE_DEPLOYMENT}"
 
 create_image() {