From c8501a421806c6526a12b2f6537ab38754e9d4ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 18:19:34 +0200
Subject: Set up /etc/machine-id before starting systemd

Otherwise, systemd will try to populate /etc, which we don't want.
---
 nixos/modules/system/boot/systemd.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nixos/modules/system/boot')

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 27ad1bdec329..afb5a9b78d8a 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -647,6 +647,10 @@ in
         # groups, in addition to those in the systemd-journal group.
         # Users can always read their own journals.
         ${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
+
+        if ! [ -e /etc/machine-id ]; then
+          ${systemd}/bin/systemd-machine-id-setup
+        fi
       '';
 
     users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
-- 
cgit 1.4.1