AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

style: rename systemdDevice into waitForDevice

Browse Source
This commit is contained in:
Dmitriy Kholkin 2025-03-10 20:17:43 +03:00
parent ebf506016e
commit 115a2545cc
Signed by: AtaraxiaDev
GPG Key ID: FD266B810DF48DF2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/redshift/default.nix
View File

@ -19,7 +19,7 @@
ataraxia.filesystems.btrfs.enable = true; ataraxia.filesystems.btrfs.enable = true;
ataraxia.filesystems.btrfs.eraseOnBoot.enable = true; ataraxia.filesystems.btrfs.eraseOnBoot.enable = true;
ataraxia.filesystems.btrfs.eraseOnBoot.device = "/dev/sda4"; ataraxia.filesystems.btrfs.eraseOnBoot.device = "/dev/sda4";
ataraxia.filesystems.btrfs.eraseOnBoot.systemdDevice = ataraxia.filesystems.btrfs.eraseOnBoot.waitForDevice =
"sys-devices-pci0000:00-0000:00:05.0-0000:01:01.0-virtio3-host0-target0:0:0-0:0:0:0-block-sda.device"; "sys-devices-pci0000:00-0000:00:05.0-0000:01:01.0-virtio3-host0-target0:0:0-0:0:0:0-block-sda.device";
ataraxia.filesystems.btrfs.eraseOnBoot.eraseVolumes = [ ataraxia.filesystems.btrfs.eraseOnBoot.eraseVolumes = [
{ {

22
modules/nixos/filesystems/btrfs.nix
View File

@ -48,15 +48,6 @@ in
default = config.persist.enable; default = config.persist.enable;
description = "Clean btrfs subvolumes on boot"; description = "Clean btrfs subvolumes on boot";
}; };
device = mkOption {
type = str;
description = "Device on which is btrfs partititon";
};
systemdDevice = mkOption {
type = str;
description = "Escaped string with name of .device service";
example = "dev-disk-by\\x2did-ata\\x2dPhison_SATA_SSD_2165.device";
};
eraseVolumes = mkOption { eraseVolumes = mkOption {
type = listOf (submodule eraseVolumesOpts); type = listOf (submodule eraseVolumesOpts);
default = [ ]; default = [ ];
@ -70,6 +61,15 @@ in
A list of subvolumes to erase on boot. A list of subvolumes to erase on boot.
''; '';
}; };
device = mkOption {
type = str;
description = "Device on which is btrfs partititon";
};
waitForDevice = mkOption {
type = str;
description = "Escaped string with name of .device service";
example = "dev-disk-by\\x2did-ata\\x2dPhison_SATA_SSD_2165.device";
};
}; };
}; };
@ -105,8 +105,8 @@ in
systemd.services.rollback = mkIf config.boot.initrd.systemd.enable { systemd.services.rollback = mkIf config.boot.initrd.systemd.enable {
description = "Rollback btrfs root subvolume to a pristine state on boot"; description = "Rollback btrfs root subvolume to a pristine state on boot";
wantedBy = [ "initrd.target" ]; wantedBy = [ "initrd.target" ];
requires = [ cfg.eraseOnBoot.systemdDevice ]; requires = [ cfg.eraseOnBoot.waitForDevice ];
after = [ cfg.eraseOnBoot.systemdDevice ]; after = [ cfg.eraseOnBoot.waitForDevice ];
before = [ "sysroot.mount" ]; before = [ "sysroot.mount" ];
path = [ path = [
pkgs.btrfs-progs pkgs.btrfs-progs