summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRoland Clobus <rclobus@rclobus.nl>2021-01-17 14:06:11 +0000
committerLuca Boccassi <bluca@debian.org>2021-01-17 14:06:11 +0000
commitd145b0c9ec36d1a912b252cff7efa4a299b30da5 (patch)
tree334c8063ae733138ada992a069fe81affc3f4616 /scripts
parentfdcdab72dce551d0f281dd295e4d3f7f6a1a57b3 (diff)
downloadvyos-live-build-d145b0c9ec36d1a912b252cff7efa4a299b30da5.tar.gz
vyos-live-build-d145b0c9ec36d1a912b252cff7efa4a299b30da5.zip
Bugfix: do not create /dev/lock and /dev/lock-frontend
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/binary_package-lists2
-rwxr-xr-xscripts/build/installer_debian-installer2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index 6d9932a5b..abc014d35 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -66,7 +66,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 -o Dir::State::status=/dev/null --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 -o Debug::NoLocking=true --download-only install"
# Remove package list
rm chroot/root/"$(basename ${LIST})"
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index 6ef511a2d..6d27ccdf4 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -366,7 +366,7 @@ then
Echo_debug "DI_FIRMWARE_PACKAGES: %s" "${DI_FIRMWARE_PACKAGES}"
# Set apt command prefix
- _LB_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o Dir::State::status=/dev/null -o APT::Install-Recommends=false --download-only"
+ _LB_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o Dir::State::status=/dev/null -o APT::Install-Recommends=false -o Debug::NoLocking=true --download-only"
if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then