feat(system-config): Readable name for the system closure

devices/zyxel-nwa50ax/default.nix

@@ -135,6 +135,21 @@ rec {
         ../../modules/zyxel-dual-image
       ];
 
+      options = {
+        hardware.wlanMacAddresses = {
+          wlan0 = lib.mkOption {
+            type = lib.types.str;
+            description = "Mac address of wlan0 device";
+          };
+          wlan1 = lib.mkOption {
+            type = lib.types.str;
+            description = "Mac address of wlan1 device";
+          };
+        };
+      };
+
+      config = {
+
         nixpkgs.hostPlatform = system.crossSystem;
 
         filesystem = dir {
@@ -208,10 +223,12 @@ rec {
               wlan0 = link.build {
                 ifname = "wlan0";
                 dependencies = [ mac80211 ];
+                mac = config.hardware.wlanMacAddresses.wlan0;
               };
               wlan1 = link.build {
                 ifname = "wlan1";
                 dependencies = [ mac80211 ];
+                mac = config.hardware.wlanMacAddresses.wlan1;
               };
             };
         };
@@ -364,4 +381,5 @@ rec {
           };
         };
       };
+    };
 }

modules/network/default.nix

@@ -74,6 +74,13 @@ in {
             device will be renamed to the name provided.
           '';
         };
+        mac = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            MAC address of the interface.
+          '';
+        };
         devpath = mkOption {
           type = types.nullOr types.str;
           default = null;

modules/network/link.nix

@@ -7,6 +7,7 @@
 {
   ifname
 , devpath ? null
+, mac ? null
 , mtu} :
 # if devpath is supplied, we rename the interface at that
 # path to have the specified name.
@@ -24,7 +25,7 @@ in oneshot {
   inherit name;
   up = ''
     ${rename}
-    ${liminix.networking.ifup name ifname}
+    ${liminix.networking.ifup name ifname mac}
   '';
   down = "ip link set down dev ${ifname}";
 }

modules/outputs/initramfs.nix

@@ -75,7 +75,7 @@ in
           mv out $out
         '';
       systemConfiguration =
-        pkgs.systemconfig config.filesystem.contents;
+        pkgs.systemconfig config.filesystem.contents config.hostname;
     };
   };
 }

modules/vlan/service.nix

@@ -11,7 +11,7 @@ in oneshot rec {
   up = ''
     ip link add link $(output ${primary} ifname) name ${ifname} type vlan id ${vid}
     ${optionalString untagged.egress "bridge vlan add dev ${ifname} vid ${toString untagged.vid} pvid untagged master"}
-    ${liminix.networking.ifup name ifname}
+    ${liminix.networking.ifup name ifname null}
     (in_outputs ${name}
      echo ${ifname} > ifname
     )

pkgs/levitate/default.nix

@@ -74,7 +74,7 @@ let
           ../../modules/s6
         ];
       };
-    in systemconfig eval.config.filesystem.contents;
+    in systemconfig eval.config.filesystem.contents eval.config.hostname;
 in writeScriptBin "levitate"  ''
   #!/bin/sh
   destdir=${newRoot}

pkgs/liminix-tools/networking/default.nix

@@ -3,9 +3,13 @@
 , serviceFns
 }:
 {
-  ifup = name : ifname : ''
+  ifup = name : ifname : mac: ''
     . ${serviceFns}
     ${ifwait}/bin/ifwait -v ${ifname} present
+    ${if (mac == null) then "" else ''
+      ip link set down dev ${ifname}
+      ip link set dev ${ifname} address ${mac}
+    ''}
     ip link set up dev ${ifname}
     (in_outputs ${name}
      echo ${ifname} > ifname

pkgs/systemconfig/default.nix

@@ -62,10 +62,10 @@ let
       ${(builtins.concatStringsSep "\n" (visit "." attrset))}
     }
   '';
-in attrset:
+in attrset: hostname:
   let makedevs = activateScript attrset;
   in stdenv.mkDerivation {
-    name="make-stuff";
+    name="${hostname}-system-configuration";
     src = ./.;
 
     CFLAGS = "-Os";