it-team/lmn-client
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trixies uses tmpfs for /tmp, so let's use /var/tmp/vm for temporary VM files

Browse source
This commit is contained in:
Raphael Dannecker 2025-01-27 17:11:12 +01:00
parent f4dffc06fc
commit 5998c5900e
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/lmn_vm/files/pam-umount.sh
View file

@ -13,12 +13,12 @@ slp=false
shutdownVMs(){ shutdownVMs(){
local VM local VM
for VM in $(sudo -u $usr XDG_RUNTIME_DIR="/run/user/$uid" \ for VM in $(sudo -u $usr XDG_RUNTIME_DIR="/run/user/$uid" \
XDG_CONFIG_HOME="/tmp/$uid/.config/" \ XDG_CONFIG_HOME="/var/tmp/vm/$uid/.config" \
XDG_CACHE_HOME="/var/cache/user/$uid/" \ XDG_CACHE_HOME="/var/cache/user/$uid/" \
virsh list --state-running | \ virsh list --state-running | \
sed -nE "s/.*\s+(\S+)\s+running/\1/p") ; do sed -nE "s/.*\s+(\S+)\s+running/\1/p") ; do
sudo -u $usr XDG_RUNTIME_DIR="/run/user/$uid" \ sudo -u $usr XDG_RUNTIME_DIR="/run/user/$uid" \
XDG_CONFIG_HOME="/tmp/$uid/.config/" \ XDG_CONFIG_HOME="/var/tmp/vm/$uid/.config" \
XDG_CACHE_HOME="/var/cache/user/$uid/" \ XDG_CACHE_HOME="/var/cache/user/$uid/" \
virsh destroy "$VM" 2>&1 | systemd-cat || true virsh destroy "$VM" 2>&1 | systemd-cat || true
slp=true slp=true

2
roles/lmn_vm/files/vm-netboot
View file

@ -5,7 +5,7 @@
set -eu set -eu
## Imporant for all virsh libvirt calls: ## Imporant for all virsh libvirt calls:
export XDG_CONFIG_HOME="/tmp/${UID}/.config" export XDG_CONFIG_HOME="/var/tmp/vm/${UID}/.config"
menu=(standard "CLI Standard Debian GNU/Linux NFS" menu=(standard "CLI Standard Debian GNU/Linux NFS"
standard-ram "CLI Standard Debian GNU/Linux RAM" standard-ram "CLI Standard Debian GNU/Linux RAM"

2
roles/lmn_vm/files/vm-run
View file

@ -295,7 +295,7 @@ if [[ "${PERSISTENT}" == 1 ]] && [[ ! -f "${VM_DIR_PERSISTENT}/${VM_NAME}.qcow2"
fi fi
# because virsh has problems with long pathnames, using diffent configdir # because virsh has problems with long pathnames, using diffent configdir
export XDG_CONFIG_HOME="/tmp/${UID}/.config" export XDG_CONFIG_HOME="/var/tmp/vm/${UID}/.config"
if ! virsh --connect="${QEMU}" list | grep "${VM_NAME}-clone"; then if ! virsh --connect="${QEMU}" list | grep "${VM_NAME}-clone"; then
echo "VM not yet running." echo "VM not yet running."

4
roles/lmn_vm/files/vm.conf
View file

@ -9,10 +9,10 @@ DESKTOPSTARTERDIR="/srv/samba/schools/default-school/share/school/AdminIT/deskto
VM_SYSDIR="/lmn/vm" VM_SYSDIR="/lmn/vm"
if [[ -v SUDO_UID ]]; then if [[ -v SUDO_UID ]]; then
VM_DIR="/tmp/${SUDO_UID}/vm" VM_DIR="/var/tmp/vm/${SUDO_UID}/vm"
VM_DIR_PERSISTENT="/var/vm/${SUDO_UID}" VM_DIR_PERSISTENT="/var/vm/${SUDO_UID}"
else else
VM_DIR="/tmp/${UID}/vm" VM_DIR="/var/tmp/vm/${UID}/vm"
VM_DIR_PERSISTENT="/var/vm/${UID}" VM_DIR_PERSISTENT="/var/vm/${UID}"
fi fi

6
roles/lmn_vm/tasks/main.yml
View file

@ -126,6 +126,12 @@
group: lmnsynci group: lmnsynci
mode: 0755 mode: 0755
- name: Create cleanup-vm.conf
ansible.builtin.copy:
dest: /etc/tmpfiles.d/clean-vm.conf
content: |
R! /var/tmp/vm
- name: Install squid - name: Install squid
apt: apt:
name: name: