diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-07-25 17:49:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-25 17:49:10 +0200 |
| commit | f146c3b01a55bf22f76847d6d6067dbe81e01db7 (patch) | |
| tree | 4720048aae2f172778837b1f58dfeb401bcc67df /data | |
| parent | edda69d4dc008a93928902b8dc4d32672fadc8b8 (diff) | |
| parent | 482f6c947bc0182abc08803e89d232bfa1349af9 (diff) | |
| download | vyos-build-f146c3b01a55bf22f76847d6d6067dbe81e01db7.tar.gz vyos-build-f146c3b01a55bf22f76847d6d6067dbe81e01db7.zip | |
Merge pull request #712 from vyos/mergify/bp/circinus/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 5f04d203..20c4afcd 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 @@ -62,9 +62,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 |