From 450ca1f0cce267e68b4950504140cdbebe1b4b8e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 13 Feb 2016 20:09:23 +0100
Subject: xu-qemu0: create socket in ~/tmp

---
 tv/2configs/xu-qemu0.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/xu-qemu0.nix b/tv/2configs/xu-qemu0.nix
index 4584dcd7c..470b16ea4 100644
--- a/tv/2configs/xu-qemu0.nix
+++ b/tv/2configs/xu-qemu0.nix
@@ -74,13 +74,13 @@ with lib;
       SyslogIdentifier = "xu-qemu0";
       ExecStart = pkgs.writeDash "xu-qemu0" ''
         set -efu
+        ${pkgs.coreutils}/bin/mkdir -p "$HOME/tmp"
         img=$HOME/tmp/xu-qemu0.raw
         if ! test -e "$img"; then
-          ${pkgs.coreutils}/bin/mkdir -p "$(${pkgs.coreutils}/bin/dirname "$img")"
           ${pkgs.kvm}/bin/qemu-img create "$img" 10G
         fi
         exec ${pkgs.kvm}/bin/qemu-kvm \
-            -monitor unix:$HOME/xu-qemu0.sock,server,nowait \
+            -monitor unix:$HOME/tmp/xu-qemu0.sock,server,nowait \
             -boot order=cd \
             -cdrom ${pkgs.fetchurl {
               url = https://nixos.org/releases/nixos/15.09/nixos-15.09.1012.9fe0c23/nixos-minimal-15.09.1012.9fe0c23-x86_64-linux.iso;
@@ -102,7 +102,7 @@ with lib;
       filename = "${pkgs.writeDash "xu-qemu0-monitor" ''
         exec ${pkgs.socat}/bin/socat \
             stdio \
-            UNIX-CONNECT:${config.users.users.xu-qemu0.home}/xu-qemu0.sock \
+            UNIX-CONNECT:${config.users.users.xu-qemu0.home}/tmp/xu-qemu0.sock \
       ''}";
     }}
     dst=${config.security.wrapperDir}/xu-qemu0-monitor
-- 
cgit v1.2.3