nixos: Move system.name logic to network-interfaces.nix

roberth · roberth · commit c8da2d49cffd · 2021-12-09T10:49:07.000Z
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
@@ -151,10 +151,7 @@ in
 
     system.name = mkOption {
       type = types.str;
-      default =
-        if config.networking.hostName == ""
-        then "unnamed"
-        else config.networking.hostName;
+      # when using full NixOS or importing the network-interfaces.nix module.
       defaultText = literalExpression ''
         if config.networking.hostName == ""
         then "unnamed"
@@ -182,6 +179,12 @@ in
 
     system.build.toplevel = system;
 
+    # Traditionally, the option default contained the logic for taking this from
+    # the network.hostName option, which is expected to define it at
+    # mkOptionDefault priority. However, we'd also like to have a default when
+    # network.hostName is not imported.
+    system.name = mkOverride ((mkOptionDefault {}).priority + 100) "unnamed";
+
   };
 
 }
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
@@ -1222,6 +1222,12 @@ in
         }
       ];
 
+    system.name = lib.mkOptionDefault (
+      if config.networking.hostName == ""
+      then "unnamed"
+      else config.networking.hostName
+    );
+
     boot.kernelModules = [ ]
       ++ optional hasVirtuals "tun"
       ++ optional hasSits "sit"
