diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-05-23 17:08:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 17:08:02 +0200 |
| commit | 6d8f8a7b46e51e080c807fc2c3f9ab8911b4b00e (patch) | |
| tree | a1825d2c7ada5697609da67ed2d9e11da74e9d82 | |
| parent | 51ba3f1ac9b5225112ceadf3473af0a2ba63ffea (diff) | |
| parent | 2cc4bf9427221753e1147b71b352a5a2c23a1ad6 (diff) | |
Merge pull request #174090 from helsinki-systems/fix/plymouth
nixos/plymouth: Fix non-systemd initrd boot
| -rw-r--r-- | nixos/modules/system/boot/plymouth.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 8b57cae3c40da..59037d4e6b4d8 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -282,18 +282,18 @@ in EOF ''; - boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.enable) '' + boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/plymouthd --help >/dev/null $out/bin/plymouth --help >/dev/null ''; - boot.initrd.extraUdevRulesCommands = mkIf (!config.boot.initrd.enable) '' + boot.initrd.extraUdevRulesCommands = mkIf (!config.boot.initrd.systemd.enable) '' cp ${config.systemd.package}/lib/udev/rules.d/{70-uaccess,71-seat}.rules $out sed -i '/loginctl/d' $out/71-seat.rules ''; # We use `mkAfter` to ensure that LUKS password prompt would be shown earlier than the splash screen. - boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.enable) (mkAfter '' + boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkAfter '' mkdir -p /etc/plymouth mkdir -p /run/plymouth ln -s ${configFile} /etc/plymouth/plymouthd.conf @@ -307,12 +307,12 @@ in plymouth show-splash ''); - boot.initrd.postMountCommands = mkIf (!config.boot.initrd.enable) '' + boot.initrd.postMountCommands = mkIf (!config.boot.initrd.systemd.enable) '' plymouth update-root-fs --new-root-dir="$targetRoot" ''; # `mkBefore` to ensure that any custom prompts would be visible. - boot.initrd.preFailCommands = mkIf (!config.boot.initrd.enable) (mkBefore '' + boot.initrd.preFailCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore '' plymouth quit --wait ''); |