diff --git a/roles/lmn_fvs/tasks/main.yml b/roles/lmn_fvs/tasks/main.yml index cf5d2e4..3079016 100644 --- a/roles/lmn_fvs/tasks/main.yml +++ b/roles/lmn_fvs/tasks/main.yml @@ -57,6 +57,7 @@ - tmux - tree - ttf-mscorefonts-installer + - twinkle - unison-gtk - w3m - wireshark diff --git a/roles/lmn_vm/files/vm-netboot b/roles/lmn_vm/files/vm-netboot index 35549ba..a60a783 100755 --- a/roles/lmn_vm/files/vm-netboot +++ b/roles/lmn_vm/files/vm-netboot @@ -26,8 +26,8 @@ else arg=("$@") fi -kernel="http://livebox/d-i/n-live/$img/live/vmlinuz" -initrd="http://livebox/d-i/n-live/$img/live/initrd.img" +kernel="http://livebox/d-i/n-live/${img%-ram}/live/vmlinuz" +initrd="http://livebox/d-i/n-live/${img%-ram}/live/initrd.img" kargs=(boot=live components splash locales=de_DE.UTF-8 keyboard-layouts=de swap=true live-config.timezone=Europe/Berlin) @@ -40,7 +40,7 @@ case "$img" in kargs+=("fetch=http://10.190.1.2/d-i/n-live/${img%-ram}/live/filesystem.squashfs") ;; *) - kargs+=(netboot=nfs "nfsroot=10.190.1.2:/srv/nfs/debian-live/$img/") + kargs+=(netboot=nfs "nfsroot=10.190.1.2:/srv/nfs/debian-live/${img%-ram}") ;; esac