about summary refs log tree commit diff
path: root/nixos/modules/installer
diff options
context:
space:
mode:
authorBernardo Meurer <bernardo@meurer.org>2022-04-25 15:02:29 -0700
committerGitHub <noreply@github.com>2022-04-25 15:02:29 -0700
commite8e87beee7180af805ee92a7836f20189e3fb0d6 (patch)
tree4992f22203ef4743cea1ec9558a518c29a32de89 /nixos/modules/installer
parent59aa6e498802e84d48c9041352552d3d75ee112d (diff)
parentacca69992cda719eb71f29f5c8eedf7892127e27 (diff)
downloadnixlib-e8e87beee7180af805ee92a7836f20189e3fb0d6.tar
nixlib-e8e87beee7180af805ee92a7836f20189e3fb0d6.tar.gz
nixlib-e8e87beee7180af805ee92a7836f20189e3fb0d6.tar.bz2
nixlib-e8e87beee7180af805ee92a7836f20189e3fb0d6.tar.lz
nixlib-e8e87beee7180af805ee92a7836f20189e3fb0d6.tar.xz
nixlib-e8e87beee7180af805ee92a7836f20189e3fb0d6.tar.zst
nixlib-e8e87beee7180af805ee92a7836f20189e3fb0d6.zip
Merge pull request #169047 from helsinki-systems/feat/systemd-stage-1-filesystems
nixos/systemd-stage-1: Fixup most filesystem tasks
Diffstat (limited to 'nixos/modules/installer')
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 458e313a3f75..329bd329dc15 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -87,19 +87,19 @@ in
   boot.initrd.availableKernelModules =
     [ "mvsdio" "reiserfs" "ext3" "ums-cypress" "rtc_mv" "ext4" ];
 
-  boot.postBootCommands =
+  boot.postBootCommands = lib.mkIf (!boot.initrd.systemd.enable)
     ''
       mkdir -p /mnt
 
       cp ${dummyConfiguration} /etc/nixos/configuration.nix
     '';
 
-  boot.initrd.extraUtilsCommands =
+  boot.initrd.extraUtilsCommands = lib.mkIf (!boot.initrd.systemd.enable)
     ''
       copy_bin_and_libs ${pkgs.util-linux}/sbin/hwclock
     '';
 
-  boot.initrd.postDeviceCommands =
+  boot.initrd.postDeviceCommands = lib.mkIf (!boot.initrd.systemd.enable)
     ''
       hwclock -s
     '';