diff options
| -rwxr-xr-x | data/live-build-config/hooks/live/18-enable-disable_services.chroot | 2 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 2 | ||||
| -rw-r--r-- | scripts/image-build/raw_image.py | 2 |
3 files changed, 3 insertions, 3 deletions
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 4680c869..0732e597 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,7 +60,6 @@ systemctl disable atop-rotate.timer systemctl disable ModemManager.service systemctl disable dnsdist.service systemctl disable haproxy.service -systemctl disable miniupnpd.service systemctl disable owamp-server.service systemctl disable twamp-server.service systemctl disable podman-auto-update.service @@ -71,6 +70,7 @@ systemctl disable nvmf-autoconnect.service systemctl disable dpkg-db-backup.timer systemctl disable dpkg-db-backup.service systemctl disable zabbix-agent2.service +systemctl disable suricata.service echo I: Enabling services systemctl enable vyos-hostsd.service diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 62cbae0c..80339308 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -489,7 +489,7 @@ if __name__ == "__main__": iter(os.remove, artifacts) ## Create the target ISO file path - iso_file = "vyos-{0}-{1}.iso".format(version_data["version"], build_config["architecture"]) + iso_file = f"vyos-{version_data['version']}-{build_config['build_flavor']}-{build_config['architecture']}.iso" ## Create live-build configuration files diff --git a/scripts/image-build/raw_image.py b/scripts/image-build/raw_image.py index 27fb27ab..5068ba1b 100644 --- a/scripts/image-build/raw_image.py +++ b/scripts/image-build/raw_image.py @@ -201,7 +201,7 @@ def create_raw_image(build_config, iso_file, work_dir): con.build_config = build_config version_data = read_version_data(con.iso_dir) version = version_data['version'] - raw_file = f"vyos-{version}.raw" + raw_file = f"vyos-{version}-{build_config['build_flavor']}-{build_config['architecture']}.raw" print(f"I: Building raw file {raw_file}") create_disk(raw_file, build_config["disk_size"]) setup_loop_device(con, raw_file) |