about summary refs log tree commit diff
path: root/nixos/modules/installer
diff options
context:
space:
mode:
authorJanne Heß <janne@hess.ooo>2022-04-16 20:46:32 +0100
committerJanne Heß <janne@hess.ooo>2022-04-24 16:32:34 +0200
commit160fb93fdc4155d7e6304f366384ad8afb00db1e (patch)
treef5f8213fc3981bc9016fbde0dc479d878a32a55d /nixos/modules/installer
parent858b460f3ca0efaadab65d2fdad39905a14b3607 (diff)
downloadnixlib-160fb93fdc4155d7e6304f366384ad8afb00db1e.tar
nixlib-160fb93fdc4155d7e6304f366384ad8afb00db1e.tar.gz
nixlib-160fb93fdc4155d7e6304f366384ad8afb00db1e.tar.bz2
nixlib-160fb93fdc4155d7e6304f366384ad8afb00db1e.tar.lz
nixlib-160fb93fdc4155d7e6304f366384ad8afb00db1e.tar.xz
nixlib-160fb93fdc4155d7e6304f366384ad8afb00db1e.tar.zst
nixlib-160fb93fdc4155d7e6304f366384ad8afb00db1e.zip
nixos/filesystems: Make most simple filesystems compatible with systemd
This includes disabling some features in the initrd by default, this is
only done when the new initrd is used. Namely, ext and bcache are
disabled by default. bcache gets an own enable option while ext is
detected like any other filesystem.
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
     '';