Merge pull request #11185 from CMCDragonkai/patch-1

Change the preset networking.hostId to use `mkDefault` so it can be easily changed by the user later.
This commit is contained in:
Nicolas B. Pierron 2015-11-21 14:13:14 +00:00
commit 946dbb4ea4

View File

@ -1,7 +1,7 @@
# This module defines the software packages included in the "minimal" # This module defines the software packages included in the "minimal"
# installation CD. It might be useful elsewhere. # installation CD. It might be useful elsewhere.
{ config, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
# Include some utilities that are useful for installing or repairing # Include some utilities that are useful for installing or repairing
@ -50,5 +50,5 @@
boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ]; boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];
# Configure host id for ZFS to work # Configure host id for ZFS to work
networking.hostId = "8425e349"; networking.hostId = lib.mkDefault "8425e349";
} }