Fix issues found testing stage 5 in a VM

- Calamares branding takes the version from VERSION at ISO build time
- das-update tray hides its icon when updates were installed elsewhere
  (watches the xbps package database)
- Installer removes guest tools of other hypervisors; the live image
  starts VBoxClient only inside VirtualBox
- Live session no longer locks the screen while the installer runs
- das-tools 0.2.0, das-installer 0.2.0, das-settings 0.4.0

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
das
2026-10-19 19:43:51 +03:00
co-authored by Claude Opus 5.5
parent d1d76c2bef
commit 5349a028c8
11 changed files with 91 additions and 23 deletions
@@ -12,10 +12,10 @@ navigation: widget
strings:
productName: "Das OS"
shortProductName: "Das OS"
version: "0.2.0"
shortVersion: "0.2"
versionedName: "Das OS 0.2.0"
shortVersionedName: "Das OS 0.2"
version: "@VERSION@"
shortVersion: "@SHORT_VERSION@"
versionedName: "Das OS @VERSION@"
shortVersionedName: "Das OS @SHORT_VERSION@"
bootloaderEntryName: "Das OS"
productUrl: "https://git.das.org.ua/das/Das-OS"
supportUrl: "https://git.das.org.ua/das/Das-OS/issues"
+19 -4
View File
@@ -22,12 +22,27 @@ if ! grep -q '^[^#]*[[:space:]]/tmp[[:space:]]' /etc/fstab; then
echo "tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0" >>/etc/fstab
fi
# Guest tools are only useful inside a virtual machine.
# Guest tools only help inside their own hypervisor (VirtualBox's ones even
# complain at every login elsewhere).
machine=$(cat /sys/class/dmi/id/sys_vendor /sys/class/dmi/id/product_name 2>/dev/null || true)
if ! grep -q '^flags.* hypervisor' /proc/cpuinfo; then
msg "real hardware: removing virtual machine guest tools"
rm -f /etc/runit/runsvdir/default/spice-vdagentd
xbps-remove -Ry spice-vdagent qemu-ga virtualbox-ose-guest || true
machine="real hardware"
fi
case $machine in
*VirtualBox* | *innotek*) unused="spice-vdagent qemu-ga" ;;
*QEMU* | *KVM*) unused="virtualbox-ose-guest" ;;
*) unused="spice-vdagent qemu-ga virtualbox-ose-guest" ;;
esac
msg "removing guest tools not needed here: $unused"
case $unused in
*spice-vdagent*) rm -f /etc/runit/runsvdir/default/spice-vdagentd ;;
esac
case $unused in
# The live image replaces this autostart file, so xbps keeps it as modified
*virtualbox*) rm -f /etc/xdg/autostart/vboxclient.desktop ;;
esac
# shellcheck disable=SC2086
xbps-remove -Ry $unused || true
# Snapper, hourly snapshots and the GRUB snapshot menu (Btrfs only).
das-snapper-setup