pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

b12f restructure #1

Merged
teutat3s merged 218 commits from b12f into main 2020-11-24 18:27:01 +00:00
Conversation 0 Commits 218 Files changed 87 +6
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4d2ac57dab - Show all commits

6
hosts/chocolatebar/virtualisation/create-service.nix
View file

@ -26,19 +26,23 @@ in
exit 0 exit 0
fi fi
echo "Creating network XML"
NET_TMP_FILE="/tmp/network.xml" NET_TMP_FILE="/tmp/network.xml"
NETUUID="$(${pkgs.libvirt}/bin/virsh net-uuid 'default' || true)" NETUUID="$(${pkgs.libvirt}/bin/virsh net-uuid 'default' || true)"
(sed "s/UUID/$NETUUID/" '${networkXML}') > "$NET_TMP_FILE" (sed "s/UUID/$NETUUID/" '${networkXML}') > "$NET_TMP_FILE"
echo "Defining and starting network"
${pkgs.libvirt}/bin/virsh net-define "$NET_TMP_FILE" ${pkgs.libvirt}/bin/virsh net-define "$NET_TMP_FILE"
${pkgs.libvirt}/bin/virsh net-start 'default' || true ${pkgs.libvirt}/bin/virsh net-start 'default' || true
VARS_FILE=${varsFile} VARS_FILE=${varsFile}
if [ ! -f "$VARS_FILE" ]; then if [ ! -f "$VARS_FILE" ]; then
echo "Copying vars filej"
cp /run/libvirt/nix-ovmf/OVMF_VARS.fd "$VARS_FILE" cp /run/libvirt/nix-ovmf/OVMF_VARS.fd "$VARS_FILE"
fi fi
echo "Replacing USB device IDs in the XML"
# Load the template contents into a tmp file # Load the template contents into a tmp file
TMP_FILE="/tmp/${vm.name}.xml" TMP_FILE="/tmp/${vm.name}.xml"
cat "${machineXML}" > "$TMP_FILE" cat "${machineXML}" > "$TMP_FILE"
@ -63,10 +67,12 @@ in
# TODO: Set correct pci address for the GPU too # TODO: Set correct pci address for the GPU too
# Setup looking glass shm file # Setup looking glass shm file
echo "Setting up looking glass shm file"
${pkgs.coreutils-full}/bin/truncate -s 0 /dev/shm/looking-glass ${pkgs.coreutils-full}/bin/truncate -s 0 /dev/shm/looking-glass
${pkgs.coreutils-full}/bin/dd if=/dev/zero of=/dev/shm/looking-glass bs=1M count=32 ${pkgs.coreutils-full}/bin/dd if=/dev/zero of=/dev/shm/looking-glass bs=1M count=32
# Load and start the xml definition # Load and start the xml definition
echo "Loading and starting the VM XML definition"
${pkgs.libvirt}/bin/virsh define "$TMP_FILE" ${pkgs.libvirt}/bin/virsh define "$TMP_FILE"
${pkgs.libvirt}/bin/virsh start '${vm.name}' ${pkgs.libvirt}/bin/virsh start '${vm.name}'
''; '';