diff options
author | Christian Breunig <christian@breunig.cc> | 2024-07-27 10:17:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-27 10:17:37 +0200 |
commit | c8de52265285b64a51e47a63cbfbe8cdad2b796c (patch) | |
tree | 7a5397d56ea59604859c3bec80820a6d197236dd /data | |
parent | c676a1bb4686a9667be4c168153d6e6d140e7f9d (diff) | |
parent | c58357992d96d26996e9b9c3b92636298fa0cddc (diff) | |
download | vyos-build-c8de52265285b64a51e47a63cbfbe8cdad2b796c.tar.gz vyos-build-c8de52265285b64a51e47a63cbfbe8cdad2b796c.zip |
Merge pull request #719 from vyos/mergify/bp/sagitta/pr-709
podman: T6598: add custom podman build for version 4.9.5 (backport #709)
Diffstat (limited to 'data')
3 files changed, 0 insertions, 20 deletions
diff --git a/data/live-build-config/archives/trixie.list.chroot b/data/live-build-config/archives/trixie.list.chroot deleted file mode 100644 index 1e6803c3..00000000 --- a/data/live-build-config/archives/trixie.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -deb http://deb.debian.org/debian/ trixie main -deb http://deb.debian.org/debian/ trixie-updates main diff --git a/data/live-build-config/archives/trixie.pref.chroot b/data/live-build-config/archives/trixie.pref.chroot deleted file mode 100644 index d1016081..00000000 --- a/data/live-build-config/archives/trixie.pref.chroot +++ /dev/null @@ -1,15 +0,0 @@ -Package: podman -Pin: version 4.9.4* -Pin-Priority: 900 - -Package: netavark -Pin: release n=trixie -Pin-Priority: 900 - -Package: libgpgme11t64 -Pin: release n=trixie -Pin-Priority: 900 - -Package: * -Pin: release n=trixie -Pin-Priority: -10 diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index d02f5b58..9bae0df5 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -60,9 +60,6 @@ systemctl disable dnsdist.service systemctl disable haproxy.service systemctl disable owamp-server.service systemctl disable twamp-server.service -systemctl disable podman-auto-update.service -systemctl disable podman-auto-update.timer -systemctl disable podman-restart.service systemctl disable vyos-wan-load-balance.service systemctl disable nvmf-autoconnect.service systemctl disable dpkg-db-backup.timer |