6 files changed, 18 insertions, 4 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml
index 292eec38..8676ad2f 100644
--- a/data/architectures/amd64.toml
+++ b/data/architectures/amd64.toml
@@ -8,6 +8,8 @@ packages = [
   "vyos-intel-ixgbe",
   "vyos-intel-ixgbevf",
   "vyos-ipt-netflow",
+  "intel-microcode",
+  "amd64-microcode"
 ]
 
 [additional_repositories.salt]
diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml
index ebf14ef4..4d8596c6 100644
--- a/data/architectures/arm64.toml
+++ b/data/architectures/arm64.toml
@@ -6,7 +6,7 @@ bootloaders = "grub-efi"
 
 [additional_repositories.salt]
   architecture = "arm64"
-  url =	"https://packages.vyos.net/saltproject/debian/11/amd64/3005"
+  url =	"https://packages.vyos.net/saltproject/debian/11/arm64/3005"
   distribution = "bullseye"
 
 [additional_repositories.zabbix]
diff --git a/data/defaults.toml b/data/defaults.toml
index 66074cae..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.79"
+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 3b4efe38..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
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 echo I: Disabling services
+systemctl disable syslog.service
 systemctl disable rsyslog.service
 systemctl disable arpwatch.service
 systemctl disable smartd.service
@@ -41,7 +42,6 @@ systemctl disable snmpd.service
 systemctl disable conserver-server.service
 systemctl disable dropbear.service
 systemctl disable fancontrol.service
-systemctl disable fastnetmon.service
 systemctl disable ddclient.service
 systemctl disable ocserv.service
 systemctl disable tuned.service
@@ -71,7 +71,7 @@ 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
@@ -79,6 +79,7 @@ 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
diff --git a/data/live-build-config/includes.chroot/etc/systemd/system.conf b/data/live-build-config/includes.chroot/etc/systemd/system.conf
index 91af4090..0c30472a 100644
--- a/data/live-build-config/includes.chroot/etc/systemd/system.conf
+++ b/data/live-build-config/includes.chroot/etc/systemd/system.conf
@@ -53,3 +53,4 @@ ShowStatus=yes
 #DefaultLimitNICE=
 #DefaultLimitRTPRIO=
 #DefaultLimitRTTIME=
+StatusUnitFormat=description