summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-12-15 17:03:28 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-12-15 17:03:28 +0100
commitbed675f400e8bdd683390c67eae69dbdca55fe93 (patch)
tree7f68ec18c7d9297181af48d09aca2eb847042eb9
parent0d3a229baad71be1d700478a424312005f85a5ca (diff)
downloadnixlib-bed675f400e8bdd683390c67eae69dbdca55fe93.tar
nixlib-bed675f400e8bdd683390c67eae69dbdca55fe93.tar.gz
nixlib-bed675f400e8bdd683390c67eae69dbdca55fe93.tar.bz2
nixlib-bed675f400e8bdd683390c67eae69dbdca55fe93.tar.lz
nixlib-bed675f400e8bdd683390c67eae69dbdca55fe93.tar.xz
nixlib-bed675f400e8bdd683390c67eae69dbdca55fe93.tar.zst
nixlib-bed675f400e8bdd683390c67eae69dbdca55fe93.zip
nixos-generate-config: Don't emit networking.hostId
Systemd already generates /etc/machine-id. So there is no need to
generate another unique host identifer.
-rw-r--r--nixos/modules/installer/tools/nixos-generate-config.pl9
1 files changed, 0 insertions, 9 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 34e5828b742c..43a83e0206de 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -476,14 +476,6 @@ EOF
 EOF
         }
 
-        # Generate a random 32-bit value to use as the host id
-        open my $rnd, "<", "/dev/urandom" or die $!;
-        read $rnd, $hostIdBin, 4;
-        close $rnd;
-
-        # Convert the 32-bit value to a hex string
-        my $hostIdHex = unpack("H*", $hostIdBin);
-
         write_file($fn, <<EOF);
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
@@ -499,7 +491,6 @@ EOF
 
 $bootLoaderConfig
   # networking.hostName = "nixos"; # Define your hostname.
-  networking.hostId = "$hostIdHex";
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Select internationalisation properties.