diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -26,7 +26,7 @@ test: checkiso .PHONY: test-no-interfaces .ONESHELL: test-no-interfaces: checkiso - scripts/check-qemu-install --debug --configd --smoketest --uefi --no-interfaces build/live-image-amd64.hybrid.iso + scripts/check-qemu-install --debug --configd --smoketest --uefi --no-interfaces --memory 8 build/live-image-amd64.hybrid.iso .PHONY: test-interfaces .ONESHELL: 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 1042cef9..1aa0326a 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 @@ -69,6 +69,7 @@ systemctl disable dpkg-db-backup.service systemctl disable zabbix-agent2.service systemctl disable suricata.service systemctl disable vyconfd.service +systemctl disable vpp.service echo I: Enabling services systemctl enable vyos-hostsd.service diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index b7b009b2..89219c40 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -554,6 +554,8 @@ try: c.expect(op_mode_prompt) c.sendline('show system memory') c.expect(op_mode_prompt) + c.sendline("show version all | match vpp") + c.expect(op_mode_prompt) ################################################# # Verify /etc/os-release via lsb_release |