Commit graph

991 commits

Author SHA1 Message Date
lassulus
51e3a7e512
Merge pull request #771 from Enzime/refactor/make-disk-image
make-disk-image: convert into NixOS module
2024-09-15 11:41:32 +01:00
Jörg Thalheim
3632080c41
Merge pull request #764 from nix-community/dependabot/github_actions/DeterminateSystems/update-flake-lock-24
build(deps): bump DeterminateSystems/update-flake-lock from 23 to 24
2024-09-14 16:59:29 +02:00
Michael Hoang
cc4d4a4b91 make-disk-image: convert into NixOS module
As `makeDiskImages` always requires a NixOS configuration, we can
simplify the code by convering it into a NixOS module. Then we can make
it responsible for populating `system.build.diskoImages` and
`system.build.diskoImagesScript`.
2024-09-14 19:35:44 +10:00
Jörg Thalheim
4ef99d8ec4
Merge pull request #768 from nix-community/mergify/Mic92/config-update
ci(Mergify): configuration update
2024-09-13 11:17:20 +02:00
Jörg Thalheim
0f0b7f409d ci(Mergify): configuration update
Signed-off-by: Jörg Thalheim <null>
2024-09-13 11:17:11 +02:00
Michael Hoang
59fb64b36b make-disk-image: automatically add ZFS to kernel
Fixes #461
2024-09-12 15:06:25 +00:00
lassulus
495c2d7673
Merge pull request #766 from Enzime/disko-vm
Add `virtualisation.vmVariantWithDisko` option
2024-09-12 08:57:52 +01:00
dependabot[bot]
1eb54f6efc
build(deps): bump DeterminateSystems/update-flake-lock from 23 to 24
Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 23 to 24.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v23...v24)

---
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-09-09 19:24:19 +00:00
Michael Hoang
0943a50ee7 interactive-vm: convert into NixOS module 2024-09-09 16:06:20 +10:00
Michael Hoang
ba66c22ec1 Add virtualisation.vmVariantWithDisko option 2024-09-09 16:06:20 +10:00
lassulus
e55f9a8678
Merge pull request #757 from nix-community/disk-deactiviate
disk-deactivate: only run zfs command if they are present
2024-09-03 17:37:14 +02:00
Jörg Thalheim
8f0f75f1a8 zpool: better error message if zpool has no assigned devices 2024-09-03 17:11:42 +02:00
Jörg Thalheim
736c8150b9 disk-deactivate: also clear zpool labels
this helps to avoid ghost pools.
2024-09-03 17:10:47 +02:00
Jörg Thalheim
c789d113c6 disk-deactivate: only run zfs command if they are present 2024-09-03 17:10:47 +02:00
Jörg Thalheim
37c83c08d1
Merge pull request #723 from dmadisetti/dm/zfs-extra
zfs: add ZFS "topology" features like explicit vdevs, cache, and special
2024-09-03 17:07:39 +02:00
Sergey Kazenyuk
099b6cca33 btrfs: add swap priority, options 2024-09-03 14:06:14 +00:00
Sergey Kazenyuk
39b4091769 swap: add mountOptions 2024-09-03 14:06:14 +00:00
lassulus
85538a44de
Merge pull request #754 from 0x450x6c/use-qcow-in-interactive-vm
Switch to qcow in the interactive VM to avoid hangs when using large image size.
2024-09-03 15:56:58 +02:00
github-actions[bot]
96073e6423 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a6292e34000dc93d43bccf78338770c1c5ec8a99?narHash=sha256-NlpGA4%2BAIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM%3D' (2024-08-27)
  → 'github:NixOS/nixpkgs/b833ff01a0d694b910daca6e2ff4a3f26dee478c?narHash=sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w%2BROpMfuw%3D' (2024-09-01)
2024-09-02 01:58:27 +00:00
zerox
70a22d25a2 Switch to qcow2 in the interactive VM. 2024-08-31 09:57:41 +05:00
github-actions[bot]
511388d837 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ae815cee91b417be55d43781eb4b73ae1ecc396c?narHash=sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ%3D' (2024-08-23)
  → 'github:NixOS/nixpkgs/a6292e34000dc93d43bccf78338770c1c5ec8a99?narHash=sha256-NlpGA4%2BAIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM%3D' (2024-08-27)
2024-08-29 01:44:36 +00:00
lassulus
b89a61129f
Merge pull request #750 from whs-dot-hk/fix-writer
Fix writeDashBin
2024-08-27 16:39:32 +02:00
whs
517664d2fd Fix writeDashBin 2024-08-27 21:03:36 +08:00
dylan madisetti
cf5d451adc
test: Add cache specific test 2024-08-27 08:29:31 -04:00
Dylan Madisetti
071306e76a
tidy: apply suggestions from code review
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2024-08-26 14:13:07 -04:00
dylan madisetti
c9d3bc3755
fix: properly apply oneOf 2024-08-26 14:00:44 -04:00
dylan madisetti
ea3ce722ea
zfs: fix test and add documentation 2024-08-26 13:03:25 -04:00
dylan madisetti
cc2e247193
zfs: make topology a mode type 2024-08-26 12:27:04 -04:00
zerox
540cd416f6
zfs: add ability to specify full path of to the disk. 2024-08-26 09:48:53 +05:00
github-actions[bot]
b09eb605e3 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/36a9aeaaa17a2d4348498275f9fe530cd4f9e519?narHash=sha256-z4nw9HxkaXEn%2B5OT8ljLVL2oataHvAzUQ1LEi8Fp%2BSY%3D' (2024-08-21)
  → 'github:NixOS/nixpkgs/ae815cee91b417be55d43781eb4b73ae1ecc396c?narHash=sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ%3D' (2024-08-23)
2024-08-26 02:34:47 +00:00
Felix Uhl
435737144b swap: don't create filesystem if randomEncryption is enabled
This is not an issue when initially creating the partition because
device mapper will just map on top of the filesystem, but it breaks
incremental updates because the check for `TYPE=` will fail, and the
subsequent attempt to run `mkswap` also fails:

mkswap: cannot open /dev/disk/by-partlabel/disk-nix-store-swap: Device or resource busy

Instead, just don't do anything, NixOS will take care of it.
2024-08-22 17:59:43 +00:00
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