From b0709a644345a84c3458d7f987495d4a9995f6f0 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Sun, 4 Feb 2024 17:19:03 +0000
Subject: [PATCH] systemconfig: fix missing backslashes on env vars

---
 pkgs/systemconfig/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/systemconfig/default.nix b/pkgs/systemconfig/default.nix
index 8ec00aa..f6f38b1 100644
--- a/pkgs/systemconfig/default.nix
+++ b/pkgs/systemconfig/default.nix
@@ -92,10 +92,13 @@ in attrset:
         # case otherwise we will install into a ramfs/rootfs
         ""
       }
-      if test -d $dest/persist; then dest=$dest/persist; fi
+      if test -d \$dest/persist; then dest=\$dest/persist; fi
       cp -v -fP \$src/bin/* \$src/etc/* \$dest
       ${if attrset ? boot then ''
-        (cd \$dest && rm ./boot && ln -sf ${lib.strings.removePrefix "/" attrset.boot.target} ./boot)
+        (cd \$dest
+         if test -e boot ; then rm boot ; fi
+         ln -sf ${lib.strings.removePrefix "/" attrset.boot.target} ./boot
+        )
       '' else ""}
       EOF
       chmod +x $out/bin/install