Mirrors/disko
2
0
Fork 0
mirror of https://github.com/nix-community/disko synced 2024-11-12 23:27:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
235 commits 25 branches 14 tags 3.4 MiB
Commit graph

235 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
bors[bot]
f0a96e4de6
Merge #117 
117: add disko-doc r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
 2023-01-19 08:06:38 +00:00
mergify[bot]
b1f6461255
Merge pull request #118 from nix-community/update_flake_lock_action 
flake.lock: Update
 2023-01-16 01:42:24 +00:00
github-actions[bot]
42a398e607 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0abc5480edcab69f26e1bdd5f7ee82890cfe273f' (2023-01-11)
  → 'github:NixOS/nixpkgs/37b97ae3dd714de9a17923d004a2c5b5543dfa6d' (2023-01-13)
 2023-01-16 01:35:36 +00:00
Jörg Thalheim
36ef99fca6 add disko-doc 2023-01-15 21:34:52 +01:00
mergify[bot]
d4ad959543
Merge pull request #110 from nix-community/update_flake_lock_action 
flake.lock: Update
 2023-01-12 01:52:40 +00:00
github-actions[bot]
c671492950 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0c9aadc8eff6daaa5149d2df9e6c49baaf44161c' (2023-01-08)
  → 'github:NixOS/nixpkgs/0abc5480edcab69f26e1bdd5f7ee82890cfe273f' (2023-01-11)
 2023-01-12 01:37:44 +00:00
bors[bot]
1c36b112fc
Merge #109 
109: README: Advertise correct branch name in channel url r=Mic92 a=mweinelt



Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de>
 2023-01-11 15:38:17 +00:00
Martin Weinelt
189083d355
README: Advertise correct branch name in channel url 2023-01-11 16:31:21 +01:00
bors[bot]
abcf1e18d5
Merge #105 
105: flake.lock: Update r=Mic92 a=nix-eval-jobs-bot



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
 2023-01-10 07:20:33 +00:00
github-actions[bot]
560649780e flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/298add347c2bbce14020fcb54051f517c391196b' (2023-01-03)
  → 'github:NixOS/nixpkgs/0c9aadc8eff6daaa5149d2df9e6c49baaf44161c' (2023-01-08)
 2023-01-10 08:19:55 +01:00
Jörg Thalheim
bd435b2bc8
Merge pull request #106 from l0b0/feat/shellcheck 
feat: ShellCheck
 2023-01-10 08:18:17 +01:00
Jörg Thalheim
2584fb5b82 update mergify 2023-01-10 08:17:29 +01:00
Jörg Thalheim
bd27a2e9d4 bors.toml: drop leading line 2023-01-10 08:14:04 +01:00
Jörg Thalheim
40516cfd68 update bors.toml 2023-01-10 08:11:05 +01:00
Jörg Thalheim
a6a7ccbc9b add shellcheck to flake instead 2023-01-10 08:05:45 +01:00
Victor Engmark
5a4d706e52 feat: Run ShellCheck on shell scripts 
Closes #85.
 2023-01-10 17:02:55 +13:00
Victor Engmark
4553130780 fix: Quote variable reference 
As recommended by ShellCheck.
 2023-01-10 17:02:29 +13:00
Victor Engmark
077ff277da refactor: Use command grouping rather than subshell 
As recommended by ShellCheck.
 2023-01-10 17:02:11 +13:00
Victor Engmark
148ac4c261 refactor: Use -n instead of ! -z 
As recommended by ShellCheck.
 2023-01-10 17:01:52 +13:00
Victor Engmark
388dfd8b5e fix: Remove unreferenced variable declaration 2023-01-10 17:01:28 +13:00
bors[bot]
dd025155fb
Merge #104 
104: add github action to keep flakes up-to-date r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
 2023-01-04 14:06:14 +00:00
Jörg Thalheim
1c7467f163 add github action to keep flakes up-to-date 2023-01-04 15:04:45 +01:00
Lassulus
e332988a67
Merge pull request #103 from RossComputerGuy/fix/option-descriptions 2023-01-04 11:55:27 +01:00
bors[bot]
07f6891b62
Merge #98 
98: Bcachefs r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
 2023-01-04 09:00:20 +00:00
Jörg Thalheim
dcc80387d2 add bors.toml 2023-01-04 09:57:53 +01:00
Jörg Thalheim
eca7cb9132 bcachefs support 2023-01-04 09:57:53 +01:00
Tristan Ross
d4874c22a0 feat: missing description 2023-01-03 15:35:42 -08:00
Tristan Ross
ab33709297 Merge remote-tracking branch 'upstream/master' into fix/option-descriptions 2023-01-03 11:42:37 -08:00
Tristan Ross
809f92cd25 feat: add the descriptions for the options 2023-01-03 10:52:57 -08:00
Lassulus
981160e9cf
Merge pull request #102 from RossComputerGuy/fix/types 2022-12-31 23:37:58 +01:00
Tristan Ross
5cf27f814c fix(#101): description for type handles string correctly 2022-12-31 12:30:39 -08:00
Jörg Thalheim
cb5748f03a mount filesystems with the correct type flag 2022-12-29 18:54:28 +01:00
lassulus
df3a607ad7 fix: module: define only if devices are given 2022-12-27 18:48:21 +01:00
Jörg Thalheim
1006ff074c
Merge pull request #93 from nix-community/zfs-crypto 
tests: change passphrase to secretsecret
 2022-12-27 09:05:22 +00:00