summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/architectures/arm64.toml2
-rw-r--r--data/defaults.toml2
-rwxr-xr-xdata/live-build-config/hooks/live/18-enable-disable_services.chroot3
-rw-r--r--data/live-build-config/includes.chroot/etc/systemd/system.conf1
4 files changed, 4 insertions, 4 deletions
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..4ba6a86d 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.92"
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.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