summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/defaults.json2
-rw-r--r--data/live-build-config/archives/buster.pref.chroot4
-rwxr-xr-xdata/live-build-config/hooks/live/02-issue.chroot10
-rwxr-xr-xdata/live-build-config/hooks/live/18-enable-disable_services.chroot1
-rwxr-xr-xdata/live-build-config/hooks/live/22-rm_cron_atop.chroot6
-rwxr-xr-xdata/live-build-config/hooks/live/83-cleanup-etc-motd-d.chroot4
-rw-r--r--data/live-build-config/includes.binary/isolinux/splash.pngbin21467 -> 40176 bytes
-rw-r--r--data/live-build-config/includes.chroot/etc/motd10
8 files changed, 12 insertions, 25 deletions
diff --git a/data/defaults.json b/data/defaults.json
index 84e425ed..e2a93732 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -5,7 +5,7 @@
"debian_distribution": "bullseye",
"vyos_mirror": "http://dev.packages.vyos.net/repositories/current",
"vyos_branch": "current",
- "kernel_version": "5.10.76",
+ "kernel_version": "5.10.78",
"kernel_flavor": "amd64-vyos",
"release_train": "sagitta",
"bootloaders": "syslinux,grub-efi",
diff --git a/data/live-build-config/archives/buster.pref.chroot b/data/live-build-config/archives/buster.pref.chroot
index 363aeb30..8caa1e6d 100644
--- a/data/live-build-config/archives/buster.pref.chroot
+++ b/data/live-build-config/archives/buster.pref.chroot
@@ -6,10 +6,6 @@ Package: bash-completion
Pin: release n=buster
Pin-Priority: 600
-Package: ethtool
-Pin: release n=buster
-Pin-Priority: 600
-
Package: *
Pin: release n=buster
Pin-Priority: -10
diff --git a/data/live-build-config/hooks/live/02-issue.chroot b/data/live-build-config/hooks/live/02-issue.chroot
deleted file mode 100755
index 732ebeb0..00000000
--- a/data/live-build-config/hooks/live/02-issue.chroot
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-echo I: Rewriting /etc/issue and /etc/issue.net
-cat <<EOF > etc/issue
-Welcome to VyOS - \n \l
-
-EOF
-cat <<EOF > etc/issue.net
-Welcome to VyOS
-EOF
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 ee3b38bf..a67d8c2e 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
@@ -51,6 +51,7 @@ systemctl disable ndppd.service
systemctl disable ipsec.service
systemctl disable strongswan-starter.service
systemctl disable avahi-daemon.service
+systemctl disable atop-rotate.timer
echo I: Enabling services
systemctl enable ssh-session-cleanup.service
diff --git a/data/live-build-config/hooks/live/22-rm_cron_atop.chroot b/data/live-build-config/hooks/live/22-rm_cron_atop.chroot
new file mode 100755
index 00000000..7f77e1f7
--- /dev/null
+++ b/data/live-build-config/hooks/live/22-rm_cron_atop.chroot
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -f /etc/cron.d/atop ]; then
+ rm -f /etc/cron.d/atop
+fi
+
diff --git a/data/live-build-config/hooks/live/83-cleanup-etc-motd-d.chroot b/data/live-build-config/hooks/live/83-cleanup-etc-motd-d.chroot
new file mode 100755
index 00000000..9d8dc97e
--- /dev/null
+++ b/data/live-build-config/hooks/live/83-cleanup-etc-motd-d.chroot
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -f /etc/update-motd.d/10-uname ]; then
+ rm -f /etc/update-motd.d/10-uname
+fi
diff --git a/data/live-build-config/includes.binary/isolinux/splash.png b/data/live-build-config/includes.binary/isolinux/splash.png
index 78e8a8d5..932ca36e 100644
--- a/data/live-build-config/includes.binary/isolinux/splash.png
+++ b/data/live-build-config/includes.binary/isolinux/splash.png
Binary files differ
diff --git a/data/live-build-config/includes.chroot/etc/motd b/data/live-build-config/includes.chroot/etc/motd
deleted file mode 100644
index f353136d..00000000
--- a/data/live-build-config/includes.chroot/etc/motd
+++ /dev/null
@@ -1,10 +0,0 @@
-Welcome to VyOS!
-
-Check out project news at https://blog.vyos.io
-and feel free to report bugs at https://phabricator.vyos.net
-
-You can change this banner using "set system login banner post-login" command.
-
-VyOS is a free software distribution that includes multiple components,
-you can check individual component licenses under /usr/share/doc/*/copyright
-