github-actions[bot]
e2698264c8
flake.lock: Update
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/a0feb36dc510bfa8f8809980a8230617fb9eb618' (2023-01-29)
→ 'github:NixOS/nixpkgs/50e4dbf35b95fd2b96718b656ebcbc6f9fa3a4ab' (2023-01-31)
2023-02-02 01:39:43 +00:00
bors[bot]
e97f8b7ab7
Merge #134
...
134: Update bcachefs r=Mic92 a=Mic92
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-02-01 21:57:34 +00:00
Jörg Thalheim
5f4651aa0b
bcachefs: 2022-12-29 -> 2023-02-01
2023-02-01 22:56:32 +01:00
bors[bot]
e1f892517e
Merge #129
...
129: flake.lock: Update r=Mic92 a=disko-bot
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-01-30 11:28:42 +00:00
Jörg Thalheim
309618f10a
Merge pull request #131 from nix-community/type-refactoring
...
Split disko type into multiple files
2023-01-30 11:26:56 +00:00
github-actions[bot]
2ac68063b8
flake.lock: Update
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/cfb43ad7b941d9c3606fb35d91228da7ebddbfc5' (2023-01-20)
→ 'github:NixOS/nixpkgs/a0feb36dc510bfa8f8809980a8230617fb9eb618' (2023-01-29)
2023-01-30 01:26:57 +00:00
Jörg Thalheim
48e4c06004
split disko type into multiple files
2023-01-29 08:10:33 +01:00
bors[bot]
aa26c0ce0d
Merge #128
...
128: add support for another mountpoint than /mnt r=Mic92 a=Lassulus
Co-authored-by: lassulus <lassulus@lassul.us>
Co-authored-by: lassulus <git@lassul.us>
2023-01-28 17:21:26 +00:00
lassulus
f49536f004
types.table: get device mountOptions the correct way
2023-01-28 18:08:31 +01:00
lassulus
08dc4d06da
disk-deactivate: follow by-id/by-uuid links to real device
2023-01-28 18:08:31 +01:00
lassulus
6bbccd8edd
types: relax filename, pathname & absolute pathname
2023-01-28 18:08:31 +01:00
lassulus
af2da574be
add support for another mountpoint than /mnt
2023-01-28 18:08:31 +01:00
bors[bot]
d7e178126f
Merge #127
...
127: move linuxPackages_bcachefs to legacyPackages r=Mic92 a=Mic92
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-01-23 14:36:00 +00:00
Jörg Thalheim
e018cf8c59
update bors toml
2023-01-23 15:35:25 +01:00
Jörg Thalheim
65a8e3f9a0
move linuxPackages_bcachefs to legacyPackages
2023-01-23 15:34:35 +01:00
bors[bot]
2c82dbc132
Merge #126
...
126: Bcachefs fixes r=Mic92 a=Mic92
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-01-23 09:57:20 +00:00
github-actions[bot]
232aed177d
flake.lock: Update
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/37b97ae3dd714de9a17923d004a2c5b5543dfa6d' (2023-01-13)
→ 'github:NixOS/nixpkgs/cfb43ad7b941d9c3606fb35d91228da7ebddbfc5' (2023-01-20)
2023-01-23 10:56:51 +01:00
Jörg Thalheim
eca1957835
vendorize bcachefs kernel
2023-01-23 10:56:51 +01:00
Jörg Thalheim
825be2b627
Merge pull request #123 from nix-community/doc
...
Revert "don't use bot token for flake updates"
2023-01-23 08:29:44 +00:00
Jörg Thalheim
5e1969f952
Revert "don't use bot token for flake updates"
...
This reverts commit c681875a0c
.
That did not quite work, but now we have our own bot for disko.
2023-01-23 09:29:14 +01:00
Jörg Thalheim
8903d73825
Merge pull request #121 from nix-community/updates
...
don't use bot token for flake updates
2023-01-23 08:15:50 +00:00
Jörg Thalheim
c681875a0c
don't use bot token for flake updates
2023-01-23 09:15:25 +01:00
bors[bot]
53f71ef232
Merge #120
...
120: ci: automerge flake updates r=Mic92 a=Mic92
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-01-23 08:09:29 +00:00
Jörg Thalheim
3da5595a9c
drop mergify
2023-01-23 09:08:59 +01:00
Jörg Thalheim
f0fff7ab32
ci: automerge flake updates
2023-01-23 09:06:47 +01:00
Lassulus
e1eba38e8e
Merge pull request #95 from phaer/zfs-crypto
2023-01-19 13:23:39 +01:00
phaer
a63d0fa12b
hooks: add description
2023-01-19 13:12:08 +01:00
phaer
caf893b6eb
hooks: remove debug output
2023-01-19 13:09:41 +01:00
phaer
dfd7ee9590
module: dash -> bash
2023-01-19 13:07:31 +01:00
phaer
f8050d6f84
fix examples...
...
...why did those tests pass before? config didn't match options schema
2023-01-19 13:07:31 +01:00
phaer
94d1319001
remove trace
2023-01-19 13:07:31 +01:00
phaer
d64b6b0868
create: use tempdir for DEVICES...
...
instead of env vars. As we need to append to them in subshells.
2023-01-19 13:07:31 +01:00
phaer
5034d2d836
mount: allow empty .dev
2023-01-19 13:07:31 +01:00
phaer
10e1037ad7
Revert "replace subshell by code block..."
...
This reverts commit 9628475f870cafc470dd7ad7b829b60f1b649861.
2023-01-19 13:07:31 +01:00
phaer
63eca64653
replace subshell by code block...
...
..for now, because subshell break zfs creation
2023-01-19 13:07:31 +01:00
phaer
32f3730777
Revert "try an anonymous function for namespacing..."
...
This reverts commit 6390d835025eb36a81bd2b97dcd1a5746e07ebfe.
2023-01-19 13:07:31 +01:00
phaer
21e31af678
try an anonymous function for namespacing...
...
...no local yet
2023-01-19 13:07:31 +01:00
phaer
ad6ab7df50
add debug output
2023-01-19 13:07:31 +01:00
phaer
c7e5f3caec
wip: add mkMountOption
2023-01-19 13:07:31 +01:00
phaer
92467bb9a8
namespace hooks via subshell
2023-01-19 13:07:31 +01:00
phaer
0e658ad7f7
run hooks, fix defineHookVariables
2023-01-19 13:07:31 +01:00
phaer
313d0e2315
re-add mkCreateOption
2023-01-19 13:07:31 +01:00
phaer
7b59532520
_mount: take an attrset
2023-01-19 13:07:31 +01:00
phaer
30642cadbc
_create: take an attrset
...
Please enter the commit message for your changes. Lines starting
2023-01-19 13:07:31 +01:00
phaer
360ee1522f
revert mkCreateOption
2023-01-19 13:07:31 +01:00
phaer
a78d3ce578
add hookMixin
2023-01-19 13:07:31 +01:00
phaer
ac991c281b
style: concatStrings map -> concatMapStrings
2023-01-19 13:07:31 +01:00
phaer
8e4b2d1e3b
wip: optionsAfterCreate -> postCreateHook...
...
and introduce defineHookVariables
2023-01-19 13:07:31 +01:00
phaer
fb229950e0
fix: make optionsAfterCreate optional.
2023-01-19 13:07:31 +01:00
phaer
49badf305f
zpool: add optionsAfterCreate...
...
Not sure about the best implementation here yet.
I'd like to use disk encryption with ZFS and existing disko facilities
work fine to set it up, but we obviously can't use keylocation=prompt
during disko formatting. So unlocking fails on boot if the file referred
to by keylocation isn't included in the initrd.
Ideally I could use keylocation=file://tmp/disk.key during partitioning,
but set keylocation=prompt right after that.
example usage:
```
rpool = {
type = "zpool";
mode = "";
options = {
ashift = "12";
autotrim = "on";
};
optionsAfterCreate = {
keylocation = "prompt";
};
rootFsOptions = {
encryption = "on";
keylocation = "file:///tmp/disk.key";
keyformat = "passphrase";
compression = "zstd";
acltype = "posixacl";
mountpoint = "none";
canmount = "off";
xattr = "sa";
dnodesize = "auto";
normalization = "formD";
relatime = "on";
};
```
2023-01-19 13:07:31 +01:00