From f5e7190572dcc3f0f62918f1676439706623fe93 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 28 Apr 2015 17:15:02 +0200 Subject: [PATCH] nixos.system_tarball_pc: Fix evaluation It was broken due to 57b05765c968c1ad5245c59513d11d679ed7130d. ZFS requires `networking.hostId` to be set. --- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 3 --- nixos/modules/profiles/base.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index fde9989e1f9..446d79ce220 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -45,9 +45,6 @@ with lib; # Get a console as soon as the initrd loads fbcon on EFI boot. boot.initrd.kernelModules = [ "fbcon" ]; - # Configure host id for ZFS to work - networking.hostId = "8425e349"; - # Allow the user to log in as root without a password. users.extraUsers.root.initialHashedPassword = ""; } diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 0d40b7112df..6c8e9994379 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -54,4 +54,6 @@ # Include support for various filesystems. boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "zfs" "ntfs" "cifs" ]; + # Configure host id for ZFS to work + networking.hostId = "8425e349"; }