diff options
author | Christian Breunig <christian@breunig.cc> | 2024-07-24 20:06:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-24 20:06:39 +0200 |
commit | c3513444a98fd96342929724cb1ce35bb6695c31 (patch) | |
tree | 14ba19d866ebeb6856a091194d540c17c68d16f4 /data | |
parent | 67f8d13fc99e39bee38f3f601b1ce4180313588c (diff) | |
parent | a9baaaba16124f847911eeceaff3dbf17f397aeb (diff) | |
download | vyos-build-c3513444a98fd96342929724cb1ce35bb6695c31.tar.gz vyos-build-c3513444a98fd96342929724cb1ce35bb6695c31.zip |
Merge pull request #709 from c-po/podman-T6598
podman: T6598: add custom podman build for version 4.9.5
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 0732e597..26c7f094 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 |