diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/18-enable-disable_services.chroot | 3 | ||||
| -rw-r--r-- | data/live-build-config/includes.binary/compat | 10 |
3 files changed, 12 insertions, 3 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index 662e864f..11c64317 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "https://packages.vyos.net/repositories/current" vyos_branch = "current" release_train = "current" -kernel_version = "6.6.89" +kernel_version = "6.6.93" kernel_flavor = "vyos" bootloaders = "syslinux,grub-efi" 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 1a464404..04ca7f3e 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 @@ -71,16 +71,15 @@ systemctl disable zabbix-agent2.service systemctl disable suricata.service systemctl disable vyconfd.service systemctl disable vpp.service -systemctl disable vyos-commitd.service systemctl disable netplug.service - echo I: Enabling services systemctl enable vyos-hostsd.service systemctl enable acpid.service systemctl enable vyos-router.service systemctl enable vyos-configd.service systemctl enable vyos-grub-update.service +systemctl enable vyos-commitd.service echo I: Masking services systemctl mask systemd-journald-audit.socket diff --git a/data/live-build-config/includes.binary/compat b/data/live-build-config/includes.binary/compat new file mode 100644 index 00000000..2bdeeb14 --- /dev/null +++ b/data/live-build-config/includes.binary/compat @@ -0,0 +1,10 @@ +# VyOS 1.3.x image upgrade scipt checked if an image file was a valid ISO file +# by grepping it for "ISO9660". +# (The correct way to do that would be to use file/libmagic, +# but we cannot change the past). +# At some point something has changed in xorriso or some other tool +# and images no longer include that string. +# so the image validity check fails. +# To allow direct upgrades from older versions, +# we artificially include that string to make the old check pass. +ISO9660 |