10 files changed, 48 insertions, 26 deletions
diff --git a/LICENSE.artwork b/LICENSE.artwork
new file mode 100644
index 00000000..81f20f62
--- /dev/null
+++ b/LICENSE.artwork
@@ -0,0 +1,32 @@
+# The spirit
+
+VyOS is free (as in freedom) software. We keep the source code and the build tools freely-licensed
+and available to everyone to inspect, modify, and distribute.
+The goal of VyOS is to create a network operating system available to everyone who needs it.
+We welcome contributions from all community members and we are happy to share our work on LTS releases
+with contributors. We also don't require contributors to give us exclusive rights to their contributions,
+and VyOS source code belongs to the entire community.
+
+However, success of a project and its ability to receive funding through commercial services
+rests on the reputation of its maintainers.
+And the "pay for binaries" LTS release model only works if access to images is actually restricted
+to those who support the project by purchasing a subscription or contributing.
+
+We cannot let other people and organizations exploit our reputation for gain or put it at risk
+by distributing modified images with VyOS branding, or compromise the LTS business model
+by redistributing pre-built images meant for subscription holders.
+
+We enforce that through trademarks and copyrighted artwork.
+
+Use and distribution of pre-built LTS images is governed by a EULA you can find in /usr/share/doc/vyos/EULA
+on the live image and in installed systems. 
+
+Self-built images can be freely distributed, but only if you replace the branding with yourn own,
+that is, replace all artwork files that contain the VyOS logo and all end-user-visible mentions of the VyOS name.
+
+# The letter
+
+VyOS is a registered trademarks in the United States, countries of the European Union, and other countries.
+
+The copyright to the artwork files that contain the VyOS logo, such as data/live-build-config/includes.binary/isolinux/splash.png
+belongs to Sentrium S.L. and affiliated, all rights reserved. 
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
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
-
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index 39cbf266..a2a7f054 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -118,8 +118,11 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, iso_img=None):
         cpu = ""
 
     uefi = ""
+    uuid = "f48b60b2-e6ad-49ef-9d09-4245d0585e52"
     if enable_uefi:
         uefi = "-bios /usr/share/OVMF/OVMF_CODE.fd"
+        name = f"{name}-UEFI"
+        uuid = "d27cf29e-4419-4407-8f82-dc73d1acd184"
 
     cdrom = ""
     if iso_img:
@@ -143,7 +146,7 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, iso_img=None):
         -netdev user,id=n6 -device virtio-net-pci,netdev=n6,mac={macbase}:06 \
         -netdev user,id=n7 -device virtio-net-pci,netdev=n7,mac={macbase}:07 \
         -machine accel=kvm \
-        -uuid f48b60b2-e6ad-49ef-9d09-4245d0585e52 \
+        -uuid {uuid} \
         -nographic {cpu} {cdrom} {kvm} \
         -drive format=raw,file={disk_img}'