Commit graph

956 commits

Author SHA1 Message Date
Felix Uhl
f6b2e0052d zfs_fs: Fix errors when not changing mountpoint
Running `zfs set mountpoint=/mnt/my-ds tank/my-ds`, ZFS may try to
unmount the dataset even if the mountpoint didn't change.
To avoid the confusing error message, this command is now only run when
the mountpoint actually changes.
2024-08-22 17:50:13 +00:00
github-actions[bot]
4b866c9942 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a0d6390cb3e82062a35d0288979c45756e481f60?narHash=sha256-uljX21%2BD/DZgb9uEFFG2dkkQbPZN%2Big4Z6%2BUCLWFVAk%3D' (2024-08-17)
  → 'github:NixOS/nixpkgs/36a9aeaaa17a2d4348498275f9fe530cd4f9e519?narHash=sha256-z4nw9HxkaXEn%2B5OT8ljLVL2oataHvAzUQ1LEi8Fp%2BSY%3D' (2024-08-21)
2024-08-22 01:35:08 +00:00
lassulus
74a12fdf53
Merge pull request #742 from dasJ/fix/manual
Fix the manual by fixing string escape
2024-08-21 17:07:16 +02:00
lassulus
6433571556
Merge pull request #713 from nix-community/interactiveVM
add interactive VMs
2024-08-21 16:12:23 +02:00
Janne Heß
5b36e65c7c
Fix the manual by fixing string escape 2024-08-21 12:56:32 +02:00
Jörg Thalheim
5715bc02df
Update docs/interactive-vm.md
Co-authored-by: Paul Haerle <hello@phaer.org>
2024-08-20 17:13:58 +02:00
Jörg Thalheim
a7656d4827
Update README.md
Co-authored-by: Paul Haerle <hello@phaer.org>
2024-08-20 17:13:52 +02:00
lassulus
c7b14da22e
Merge pull request #741 from Ma27/options-json
module: fix options.json rendering again
2024-08-20 16:18:44 +02:00
Maximilian Bosch
ffc718f154
module: fix options.json rendering again 2024-08-20 14:06:57 +02:00
lassulus
93d5cff63d
Merge pull request #740 from MatthewCroughan/mc/f2fs
f2fs: init
2024-08-20 11:57:11 +02:00
matthewcroughan
cc86fe1a7c f2fs: init 2024-08-20 10:26:29 +01:00
github-actions[bot]
4e719b38fa flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/daf7bb95821b789db24fc1ac21f613db0c1bf2cb?narHash=sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE%3D' (2024-08-14)
  → 'github:NixOS/nixpkgs/a0d6390cb3e82062a35d0288979c45756e481f60?narHash=sha256-uljX21%2BD/DZgb9uEFFG2dkkQbPZN%2Big4Z6%2BUCLWFVAk%3D' (2024-08-17)
2024-08-19 01:37:07 +00:00
Jörg Thalheim
fd43891af4
Merge pull request #737 from SuperSandro2000/patch-1
Fix options.json rendering
2024-08-18 17:50:16 +02:00
Sandro
1a0a69e2aa
Fix options.json rendering 2024-08-18 17:36:27 +02:00
github-actions[bot]
276a0d055a flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/154bcb95ad51bc257c2ce4043a725de6ca700ef6?narHash=sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8%3D' (2024-08-09)
  → 'github:NixOS/nixpkgs/daf7bb95821b789db24fc1ac21f613db0c1bf2cb?narHash=sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE%3D' (2024-08-14)
2024-08-15 01:31:59 +00:00
lassulus
f1e929d121
Merge pull request #698 from MatthewCroughan/mc/make-builder-kernel-configurable
make-disk-image: make pkgs, qemu and kernelPackages configurable and overridable
2024-08-14 23:08:31 +02:00
matthewcroughan
d8a1d5e1f0 make-disk-image: allow vmTools qemu usage to be overriden by disko configuration
This is needed to prevent two layers of emulation when offering a build for a host running binfmt such as an x86 host trying to compile for aarch64 via binfmt
2024-08-14 20:05:56 +01:00
matthewcroughan
de015d2a44 make-disk-image: allow pkgs to be overriden by disko configuration
This is needed when the nixosConfig you're building for modifies nixpkgs options that lead to evaluation failing unnecessarily
2024-08-14 20:05:56 +01:00
matthewcroughan
f5cc4b55e5 make-disk-image: allow kernel to be overriden by disko configuration
This is especially useful when trying to build images for embedded systems such as the pi, which have a vendor kernel that can't be booted as part of the disko image builder process
2024-08-14 20:05:56 +01:00
github-actions[bot]
0d510fe40b flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/f5129fb42b9c262318130a97b47516946da3e7d7?narHash=sha256-O/kxmybNecC3Efr6ITOdtCzFv90/B2Iiedavj5aRWt0%3D' (2024-08-07)
  → 'github:NixOS/nixpkgs/154bcb95ad51bc257c2ce4043a725de6ca700ef6?narHash=sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8%3D' (2024-08-09)
2024-08-12 01:38:30 +00:00
github-actions[bot]
ffc1f95f6c flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/81610abc161d4021b29199aa464d6a1a521e0cc9?narHash=sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX%2Bd7rqnDUoRaY%3D' (2024-08-02)
  → 'github:NixOS/nixpkgs/f5129fb42b9c262318130a97b47516946da3e7d7?narHash=sha256-O/kxmybNecC3Efr6ITOdtCzFv90/B2Iiedavj5aRWt0%3D' (2024-08-07)
2024-08-08 01:33:08 +00:00
github-actions[bot]
0257e44f4a flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce?narHash=sha256-5US0/pgxbMksF92k1%2BeOa8arJTJiPvsdZj9Dl%2BvJkM4%3D' (2024-07-31)
  → 'github:NixOS/nixpkgs/81610abc161d4021b29199aa464d6a1a521e0cc9?narHash=sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX%2Bd7rqnDUoRaY%3D' (2024-08-02)
2024-08-05 01:36:45 +00:00
lassulus
a574d68d37 module: add vmWithDisko output to system 2024-08-01 13:00:08 +02:00
github-actions[bot]
7e1b215a0a flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/038fb464fcfa79b4f08131b07f2d8c9a6bcc4160?narHash=sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y%3D' (2024-07-28)
  → 'github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce?narHash=sha256-5US0/pgxbMksF92k1%2BeOa8arJTJiPvsdZj9Dl%2BvJkM4%3D' (2024-07-31)
2024-08-01 01:47:25 +00:00
github-actions[bot]
1e6f8a7b46 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/733453ac54a40997a6a690b60f3942d79560247c?narHash=sha256-Hwm46lggqtihMaRuxbNaC1ACcU2a0jO/HXqrdjMatXk%3D' (2024-07-26)
  → 'github:NixOS/nixpkgs/038fb464fcfa79b4f08131b07f2d8c9a6bcc4160?narHash=sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y%3D' (2024-07-28)
2024-07-29 01:50:15 +00:00
github-actions[bot]
5b01cea8b5 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/4f02464258baaf54992debfd010a7a3662a25536?narHash=sha256-UNDpwjYxNXQet/g3mgRLsQ9zxrbm9j2JEvP4ijF3AWs%3D' (2024-07-24)
  → 'github:NixOS/nixpkgs/733453ac54a40997a6a690b60f3942d79560247c?narHash=sha256-Hwm46lggqtihMaRuxbNaC1ACcU2a0jO/HXqrdjMatXk%3D' (2024-07-26)
2024-07-26 21:08:25 +00:00
github-actions[bot]
55e874b9c1 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c19d62ad2265b16e2199c5feb4650fe459ca1c46?narHash=sha256-cFgdjyK/VBM3hB1RfFHXcI/VOCBVAv813s1upHKX7bI%3D' (2024-07-21)
  → 'github:NixOS/nixpkgs/4f02464258baaf54992debfd010a7a3662a25536?narHash=sha256-UNDpwjYxNXQet/g3mgRLsQ9zxrbm9j2JEvP4ijF3AWs%3D' (2024-07-24)
2024-07-25 01:32:08 +00:00
beviu
4698b1ef37 disko: add nixos-install-tools to PATH
When running disko-install from a distribution that is not NixOS,
the nixos-install command was failing due to nixos-install not
being in PATH.

Fix the error by adding the nixos-install-tools package to the list
of packages passed to lib.makeBinPath.
2024-07-23 11:53:45 +00:00
github-actions[bot]
2f5df5dcce flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9355fa86e6f27422963132c2c9aeedb0fb963d93?narHash=sha256-%2B%2BTYlGMAJM1Q%2B0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU%3D' (2024-07-16)
  → 'github:NixOS/nixpkgs/c19d62ad2265b16e2199c5feb4650fe459ca1c46?narHash=sha256-cFgdjyK/VBM3hB1RfFHXcI/VOCBVAv813s1upHKX7bI%3D' (2024-07-21)
2024-07-22 01:35:07 +00:00
lassulus
5a9f2498fb luks: add testmode password "disko" 2024-07-21 22:45:12 +02:00
lassulus
c5e5018a04 make-disk-image: add testMode, copyNixStore & extraConfig params 2024-07-21 22:40:29 +02:00
lassulus
6208b31a73 nix fmt 2024-07-21 16:44:30 +02:00
Jörg Thalheim
bec6e3cde9 examples: rename vdb -> main 2024-07-19 19:33:40 +00:00
github-actions[bot]
e8e8d9a3a9 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/aa247c0c90ecf4ae7a032c54fdc21b91ca274062?narHash=sha256-GaliJqfFwyYxReFywxAa8orCO%2BEnDq2NK2F%2B5aSc8vo%3D' (2024-07-14)
  → 'github:NixOS/nixpkgs/9355fa86e6f27422963132c2c9aeedb0fb963d93?narHash=sha256-%2B%2BTYlGMAJM1Q%2B0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU%3D' (2024-07-16)
2024-07-18 01:31:28 +00:00
github-actions[bot]
bad376945d flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/aa9461550594533c29866d42f861b6ff079a7fb6?narHash=sha256-w6dlBUQYvS65f0Z33TvkcAj7ITr4NFqhF5ywss5T5bU%3D' (2024-07-10)
  → 'github:NixOS/nixpkgs/aa247c0c90ecf4ae7a032c54fdc21b91ca274062?narHash=sha256-GaliJqfFwyYxReFywxAa8orCO%2BEnDq2NK2F%2B5aSc8vo%3D' (2024-07-14)
2024-07-15 01:33:19 +00:00
github-actions[bot]
786965e1b1 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b?narHash=sha256-PlL/yXNX/C87S2N8lF/HfOJhHForf/l7E6lVWZ4jMrw%3D' (2024-07-07)
  → 'github:NixOS/nixpkgs/aa9461550594533c29866d42f861b6ff079a7fb6?narHash=sha256-w6dlBUQYvS65f0Z33TvkcAj7ITr4NFqhF5ywss5T5bU%3D' (2024-07-10)
2024-07-11 01:31:19 +00:00
github-actions[bot]
f1a00e7f55 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/61684d356e41c97f80087e89659283d00fe032ab?narHash=sha256-Q92DHQjIvaMLpawMdXnbKQjCkzAWqjhjWJYS5RcKujY%3D' (2024-07-03)
  → 'github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b?narHash=sha256-PlL/yXNX/C87S2N8lF/HfOJhHForf/l7E6lVWZ4jMrw%3D' (2024-07-07)
2024-07-08 01:33:09 +00:00
github-actions[bot]
64679cd7f3 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/b3f3c1b13fb08f3828442ee86630362e81136bbc?narHash=sha256-u%2BD%2BIOAMMl70%2BCJ9NKB%2BRMrASjInuIWMHzjLWQjPZ6c%3D' (2024-06-26)
  → 'github:NixOS/nixpkgs/61684d356e41c97f80087e89659283d00fe032ab?narHash=sha256-Q92DHQjIvaMLpawMdXnbKQjCkzAWqjhjWJYS5RcKujY%3D' (2024-07-03)
2024-07-04 01:30:46 +00:00
Jörg Thalheim
544a80a69d
Merge pull request #694 from nix-community/dependabot/github_actions/DeterminateSystems/update-flake-lock-23
build(deps): bump DeterminateSystems/update-flake-lock from 22 to 23
2024-07-01 22:05:45 +02:00
dependabot[bot]
895b2713e1
build(deps): bump DeterminateSystems/update-flake-lock from 22 to 23
Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 22 to 23.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v22...v23)

---
updated-dependencies:
- dependency-name: DeterminateSystems/update-flake-lock
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-01 19:18:07 +00:00
Jörg Thalheim
d185770ea2 examples: drop priority as we now have a reasonable default 2024-06-30 07:50:33 +00:00
Jörg Thalheim
05f4e223b5 gpt: move boot partitions to the front of disko
Than we no longer need to do this in our examples.

Co-authored-by: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
2024-06-30 07:50:33 +00:00
Jörg Thalheim
423b86a7f7 disko-install: don't copy channel
Since we use flakes, channels have no buisness.
This is consistent with nixos-anywhere.
2024-06-29 05:47:47 +00:00
Jörg Thalheim
115311bc39 zfs: try to import zpool in incremental mode
if the pool is not imported, zfs list will return a value. So to check
that the pool does not exist, we also import it.

fixes https://github.com/nix-community/disko/issues/690
2024-06-28 13:52:20 +00:00
lassulus
e8ef4773dd
Merge pull request #689 from nix-community/incremental-zfs
zfs: when dataset already exist, only update dataset options
2024-06-28 14:29:41 +02:00
Jörg Thalheim
96cab883db zfs: when dataset already exist, only update dataset options 2024-06-28 13:53:07 +02:00
github-actions[bot]
8767dbf5d7 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9693852a2070b398ee123a329e68f0dab5526681?narHash=sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs%3D' (2024-06-22)
  → 'github:NixOS/nixpkgs/b3f3c1b13fb08f3828442ee86630362e81136bbc?narHash=sha256-u%2BD%2BIOAMMl70%2BCJ9NKB%2BRMrASjInuIWMHzjLWQjPZ6c%3D' (2024-06-26)
2024-06-27 01:28:30 +00:00
Matthew_Cash
b6a1262796 lvm_vg: add lvm thinpool/thinlv support
Co-authored-by: ajs124 <git@ajs124.de>
2024-06-26 11:36:52 +00:00
lassulus
dd4d1663cc document extraRootModules better 2024-06-24 13:36:20 +00:00
github-actions[bot]
50d4d13fba flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/38d3352a65ac9d621b0cd3074d3bef27199ff78f?narHash=sha256-pmjP5ePc1jz%2BOkona3HxD7AYT0wbrCwm9bXAlj08nDM%3D' (2024-06-17)
  → 'github:NixOS/nixpkgs/9693852a2070b398ee123a329e68f0dab5526681?narHash=sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs%3D' (2024-06-22)
2024-06-24 01:44:17 +00:00