summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-06-21 16:49:47 +0200
committerChristian Poessinger <christian@poessinger.com>2021-06-21 16:49:47 +0200
commit0f0a8a8f317a7c4ebccd3f9da227fb1a01c29552 (patch)
treec9bb99d587aea929d90a634939b6c157034f0e42
parent58bbbb804a20fab8631a3ec9c22c59df8441343a (diff)
downloadvyos-build-0f0a8a8f317a7c4ebccd3f9da227fb1a01c29552.tar.gz
vyos-build-0f0a8a8f317a7c4ebccd3f9da227fb1a01c29552.zip
lb: T3641: APT::Default-Release="current" no longer works
Pin all packages from our current repository with a APT preference file.
-rw-r--r--data/live-build-config/archives/current.pref.chroot3
-rwxr-xr-xscripts/live-build-config1
2 files changed, 3 insertions, 1 deletions
diff --git a/data/live-build-config/archives/current.pref.chroot b/data/live-build-config/archives/current.pref.chroot
new file mode 100644
index 00000000..41126f04
--- /dev/null
+++ b/data/live-build-config/archives/current.pref.chroot
@@ -0,0 +1,3 @@
+Package: *
+Pin: release n=current
+Pin-Priority: 600
diff --git a/scripts/live-build-config b/scripts/live-build-config
index b1c3c1d1..e8ee01b1 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -61,7 +61,6 @@ lb config noauto \
--backports false \
--utc-time true \
--apt-recommends false \
- --apt-options "--yes -oAPT::Default-Release="current" -oAPT::Get::allow-downgrades=true" \
--apt-indices false
"${@}"
"""