Attempt to umount properly.
This commit is contained in:
parent
2f7da9c1b4
commit
fac98e9f09
3 changed files with 63 additions and 17 deletions
|
@ -16,7 +16,7 @@
|
||||||
block: |
|
block: |
|
||||||
<!-- mounts for home, share and nextcloud -->
|
<!-- mounts for home, share and nextcloud -->
|
||||||
<volume
|
<volume
|
||||||
fstype="cifs"
|
fstype="lmn"
|
||||||
server="{{ smb_server }}"
|
server="{{ smb_server }}"
|
||||||
path="{{ smb_share }}"
|
path="{{ smb_share }}"
|
||||||
mountpoint="/srv/samba/schools/default-school"
|
mountpoint="/srv/samba/schools/default-school"
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
line: KillUserProcesses=yes
|
line: KillUserProcesses=yes
|
||||||
insertafter: '#KillUserProcesses=no'
|
insertafter: '#KillUserProcesses=no'
|
||||||
|
|
||||||
- name: Bind mount lmn/media with nosuid directory
|
- name: Bind mount /lmn/media with nosuid directory
|
||||||
ansible.posix.mount:
|
ansible.posix.mount:
|
||||||
src: /lmn/media
|
src: /lmn/media
|
||||||
path: /lmn/media
|
path: /lmn/media
|
||||||
|
|
51
roles/lmn_vm/files/u-mount.sh
Normal file
51
roles/lmn_vm/files/u-mount.sh
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
#!/usr/bin/bash
|
||||||
|
#
|
||||||
|
# <cifsmount>/usr/local/sbin/u-mount.sh %(USER) %(USERUID) %(MNTPT) %(FSTYPE) %(OPTIONS) %(SERVER) %(VOLUME)</cifsmount>'
|
||||||
|
# <umount>/usr/local/sbin/u-mount.sh %(USER) %(USERUID) %(MNTPT)</umount>'
|
||||||
|
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
systemd-cat echo $@
|
||||||
|
|
||||||
|
LANG=C
|
||||||
|
usr="$1"
|
||||||
|
uid="$2"
|
||||||
|
mtp="$3"
|
||||||
|
|
||||||
|
if [[ "$#" -gt 3 ]] ; then
|
||||||
|
## we are mounting
|
||||||
|
fty="$4"
|
||||||
|
opt="$5"
|
||||||
|
srv="$6"
|
||||||
|
vol="$7"
|
||||||
|
case "$fty" in
|
||||||
|
"davfs")
|
||||||
|
systemd-cat echo mount -t davfs -o "$opt" "$vol" "$mtp"
|
||||||
|
exec mount -t davfs -o "$opt" "$vol" "$mtp"
|
||||||
|
;;
|
||||||
|
"cifs")
|
||||||
|
if [[ ! "$vol" =~ "sysvol" ]] ; then
|
||||||
|
home="$(getent passwd "$usr" | cut -d : -f 6)"
|
||||||
|
vol="default-school/"
|
||||||
|
mount -t cifs -o "$opt" "//$srv/$vol" "$mtp"
|
||||||
|
mkdir -p "/lmn/media/$usr/share"
|
||||||
|
mkdir -p "/lmn/media/$usr/home"
|
||||||
|
mount -o bind "/srv/samba/schools/default-school/share" "/lmn/media/$usr/share"
|
||||||
|
exec mount -o bind "$home" "/lmn/media/$usr/home"
|
||||||
|
else
|
||||||
|
mount -t cifs -o "$opt" "//$srv/$vol" "$mtp"
|
||||||
|
fi
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
# for VMname in $(sudo -u $user XDG_RUNTIME_DIR="/run/user/$uid" \
|
||||||
|
# virsh list --state-running | grep running | awk '{print $2}'); do
|
||||||
|
# sudo -u $user XDG_RUNTIME_DIR="/run/user/$uid" virsh destroy $VMname
|
||||||
|
# sleep 1
|
||||||
|
# done
|
||||||
|
#killall -9 virtiofsd
|
||||||
|
|
||||||
|
|
||||||
|
umount "/lmn/media/$usr/share" && rmdir "/lmn/media/$usr/share"
|
||||||
|
umount "/lmn/media/$usr/home" && rmdir "/lmn/media/$usr/home"
|
||||||
|
exec umount "$mtp"
|
||||||
|
fi
|
|
@ -14,25 +14,20 @@
|
||||||
# insertafter: '#auth_unix_rw = "polkit"'
|
# insertafter: '#auth_unix_rw = "polkit"'
|
||||||
# notify: reload libvirtd
|
# notify: reload libvirtd
|
||||||
|
|
||||||
- name: Configure pam_mount for VMs
|
- name: Generate bind mounts for VMs in extra mount script
|
||||||
blockinfile:
|
blockinfile:
|
||||||
dest: /etc/security/pam_mount.conf.xml
|
dest: /etc/security/pam_mount.conf.xml
|
||||||
marker: "<!-- {mark} ANSIBLE MANAGED BLOCK (bind mounts for VMs) -->"
|
marker: "<!-- {mark} ANSIBLE MANAGED BLOCK (bind mounts for VMs) -->"
|
||||||
block: |
|
block: |
|
||||||
<!-- bind mounts for the VMs, setting gid here does not work -->
|
<lmnmount>/usr/local/sbin/u-mount.sh %(USER) %(USERUID) %(MNTPT) %(FSTYPE) %(OPTIONS) %(VOLUME) "~"</lmnmount>'
|
||||||
<volume
|
<lmnumount>/usr/local/sbin/u-mount.sh %(USER) %(USERUID) %(MNTPT)</lmnumount>'
|
||||||
path="~"
|
insertafter: '^<mntoptions.*'
|
||||||
mountpoint="/lmn/media/%(USER)/home"
|
|
||||||
options="bind"
|
- name: Prepare umount script
|
||||||
><not><or><user>root</user><user>ansible</user><user>Debian-gdm</user><user>sddm</user><user>virti</user></or></not>
|
ansible.builtin.copy:
|
||||||
</volume>
|
src: u-mount.sh
|
||||||
<volume
|
dest: /usr/local/sbin/u-mount.sh
|
||||||
path="/srv/samba/schools/default-school/share"
|
mode: "0755"
|
||||||
mountpoint="/lmn/media/%(USER)/share"
|
|
||||||
options="bind"
|
|
||||||
><not><or><user>root</user><user>ansible</user><user>Debian-gdm</user><user>sddm</user><user>virti</user></or></not>
|
|
||||||
</volume>
|
|
||||||
insertafter: "<!-- END ANSIBLE MANAGED BLOCK .* -->"
|
|
||||||
|
|
||||||
- name: autostart default network for VMs
|
- name: autostart default network for VMs
|
||||||
file:
|
file:
|
||||||
|
|
Loading…
Add table
Reference in a new issue