summaryrefslogtreecommitdiff
path: root/scripts/build/binary_package-lists
diff options
context:
space:
mode:
authorRaphaël Hertzog <raphael@offensive-security.com>2019-12-19 15:54:54 +0100
committerRaphaël Hertzog <raphael@offensive-security.com>2019-12-19 15:54:54 +0100
commit04ea46d07bfd56d76e3405e0b279391b148a9999 (patch)
tree507e3ece92e67a8ac8f6cc2845aefd40a319ec4f /scripts/build/binary_package-lists
parent1682c5c8d15c34f5b0a102886457678f4119575b (diff)
downloadvyos-live-build-04ea46d07bfd56d76e3405e0b279391b148a9999.tar.gz
vyos-live-build-04ea46d07bfd56d76e3405e0b279391b148a9999.zip
binary_package-lists: avoid messing with dpkg's status file
Instead of emptying the file temporarily, just tell APT to use /dev/null instead of /var/lib/dpkg/status. Relates to #944983
Diffstat (limited to 'scripts/build/binary_package-lists')
-rwxr-xr-xscripts/build/binary_package-lists5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index a13491ee3..946313b08 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -71,8 +71,6 @@ then
fi
mkdir -p chroot/binary.deb/archives/partial
- mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
- touch chroot/var/lib/dpkg/status
for LIST in config/package-lists/*.list \
config/package-lists/*.list.binary
@@ -83,7 +81,7 @@ then
Expand_packagelist "${LIST}" "config/package-lists" > chroot/root/"$(basename ${LIST})"
# Downloading additional packages
- Chroot chroot "xargs --no-run-if-empty --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
+ Chroot chroot "xargs --no-run-if-empty --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o Dir::State::status=/dev/null --download-only install"
# Remove package list
rm chroot/root/"$(basename ${LIST})"
@@ -151,7 +149,6 @@ then
rm -f chroot/bin/Packages
rm -rf chroot/binary.deb
- mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
# Removing depends
Remove_package