summary refs log tree commit diff
path: root/pkgs/os-specific/linux/spectrum/vm
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/os-specific/linux/spectrum/vm')
-rw-r--r--pkgs/os-specific/linux/spectrum/vm/app/default.nix3
-rw-r--r--pkgs/os-specific/linux/spectrum/vm/net/default.nix6
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/spectrum/vm/app/default.nix b/pkgs/os-specific/linux/spectrum/vm/app/default.nix
index f8ff480932c..9ffed7e5b13 100644
--- a/pkgs/os-specific/linux/spectrum/vm/app/default.nix
+++ b/pkgs/os-specific/linux/spectrum/vm/app/default.nix
@@ -26,12 +26,11 @@ runCommand "vm-app" rec {
         oneshot
       '';
       up = writeText "net-up" ''
-        backtick -i LOCAL_IP {
+        backtick -E LOCAL_IP {
           pipeline { ip -j link show eth0 }
           pipeline { jq -r ".[0].address | split(\":\") | .[4:6] | \"0x\" + .[]" }
           xargs printf "100.64.%d.%d"
         }
-        importas -iu LOCAL_IP LOCAL_IP
 
         if { ip address add ''${LOCAL_IP}/32 dev eth0 }
         if { ip link set eth0 up }
diff --git a/pkgs/os-specific/linux/spectrum/vm/net/default.nix b/pkgs/os-specific/linux/spectrum/vm/net/default.nix
index 5921b62fcf7..75c86b8f92c 100644
--- a/pkgs/os-specific/linux/spectrum/vm/net/default.nix
+++ b/pkgs/os-specific/linux/spectrum/vm/net/default.nix
@@ -54,12 +54,11 @@ runCommand "vm-net" rec {
 
               # Our IP is encoded in the NIC-specific portion of the
               # interface's MAC address.
-              backtick -i CLIENT_IP {
+              backtick -E CLIENT_IP {
                 pipeline { ip -j link show $INTERFACE }
                 pipeline { jq -r ".[0].address | split(\":\") | .[4:6] | \"0x\" + .[]" }
                 xargs printf "100.64.%d.%d"
               }
-              importas -iu CLIENT_IP CLIENT_IP
 
               if { ip address add 169.254.0.1/32 dev $INTERFACE }
               if { ip link set $INTERFACE up }
@@ -121,7 +120,7 @@ runCommand "vm-net" rec {
       '';
       run = writeScript "connman-run" ''
         #! ${execline}/bin/execlineb -S0
-        backtick -in HARDWARE_INTERFACES {
+        backtick -E HARDWARE_INTERFACES {
           pipeline {
             find -L /sys/class/net -mindepth 2 -maxdepth 2 -name address -print0
           }
@@ -132,7 +131,6 @@ runCommand "vm-net" rec {
           # Extract the interface names from the address file paths.
           awk -F/ "{if (NR > 1) printf \",\"; printf \"%s\", $5}"
         }
-        importas -iu HARDWARE_INTERFACES HARDWARE_INTERFACES
 
         ${connman}/bin/connmand -ni $HARDWARE_INTERFACES
       '';