diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-07-24 21:00:11 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-07-24 21:00:11 +0200 |
| commit | 4ca60eace69ef7a99bb3b386c916b498a4597855 (patch) | |
| tree | 537f11c7622a1bb361f6047596d9a65a9e4443ba /data | |
| parent | 0189583aee26e8630d5eb0ff4ee50a2af1ca72d9 (diff) | |
| parent | abe46eca69bceaa9f15434e9d834a32a3fd9b429 (diff) | |
| download | vyos-build-4ca60eace69ef7a99bb3b386c916b498a4597855.tar.gz vyos-build-4ca60eace69ef7a99bb3b386c916b498a4597855.zip | |
Merge branch 'vyos:current' into current
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 |