Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-03-27 06:10:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove patches

Browse source
This commit is contained in:
Julien Malka 2023-11-24 21:37:18 +01:00
parent 211ddd0761
commit 8c77040001
Signed by: Luj
GPG key ID: 6FC74C847011FD83
4 changed files with 3 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/mkmachine.nix
View file

@ -6,7 +6,7 @@ let
nixpkgs-patched-src = (import inputs.nixpkgs { system = arch; }).applyPatches {
name = "nixpkgs-patches";
src = inputs.nixpkgs;
patches = [ ../patches/bcachefs-systemd-stage-1.patch ];
patches = [ ];
};
in
{

2
machines/fischer/home-julien.nix
View file

@ -71,7 +71,7 @@
gh
gh-dash
cvc5
nixpkgs-patched.signal-desktop-beta
signal-desktop-beta
coqPackages.coqide
(why3.withProvers
[

2
machines/x2100/home-julien.nix
View file

@ -69,7 +69,7 @@
gh
gh-dash
cvc5
nixpkgs-patched.signal-desktop-beta
signal-desktop-beta
coqPackages.coqide
(why3.withProvers
[

63
patches/bcachefs-systemd-stage-1.patch
View file

@ -1,63 +0,0 @@
diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix
index 851c09781339..6e5adb2a64c5 100644
--- a/nixos/modules/tasks/filesystems/bcachefs.nix
+++ b/nixos/modules/tasks/filesystems/bcachefs.nix
@@ -63,6 +63,32 @@ in
'';
};
+ boot.initrd.systemd.services = lib.mapAttrs' (mountpoint: fileSystem: let
+ mountUnitName =
+ if mountpoint == "/"
+ then "sysroot.mount"
+ else "sysroot-" + (utils.escapeSystemdPath mountpoint) + ".mount";
+ deviceUnit = (utils.escapeSystemdPath fileSystem.device) + ".device";
+ in {
+ name = "unlock-bcachefs-${utils.escapeSystemdPath mountpoint}";
+ value = {
+ requiredBy = [mountUnitName];
+ before = [mountUnitName];
+ after = [deviceUnit];
+ requires = [deviceUnit];
+ serviceConfig.Type = "oneshot";
+ script = ''
+ if ! bcachefs unlock -c ${fileSystem.device}; then
+ exit 0
+ fi
+ passphrase=
+ until bcachefs unlock ${fileSystem.device} <<<"$passphrase"; do
+ passphrase=$(systemd-ask-password "bcachefs passphrase for ${fileSystem.device}")
+ done
+ '';
+ };
+ }) bootFs;
+
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs
'';
diff --git a/nixos/tests/installer-systemd-stage-1.nix b/nixos/tests/installer-systemd-stage-1.nix
index 03f0ec8d746b..69c19f089e4c 100644
--- a/nixos/tests/installer-systemd-stage-1.nix
+++ b/nixos/tests/installer-systemd-stage-1.nix
@@ -8,6 +8,8 @@
# them when fixed.
inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; })
# bcache
+ bcachefsSimple
+ bcachefsEncrypted
btrfsSimple
btrfsSubvolDefault
btrfsSubvolEscape
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 590988d95986..027153ed31ec 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -916,7 +916,7 @@ in {
enableOCR = true;
preBootCommands = ''
machine.start()
- machine.wait_for_text("enter passphrase for ")
+ machine.wait_for_text("passphrase for ")
machine.send_chars("password\n")
'';