Mirrors/disko
2
0
Fork 0
mirror of https://github.com/nix-community/disko synced 2024-11-10 06:14:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove another instance of hostId

Browse source
This commit is contained in:
Jörg Thalheim 2023-09-02 19:42:05 +02:00 committed by mergify[bot]
parent a47b0e7599
commit ecfb74e5cf
6 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/tests.nix
View file

@ -167,8 +167,7 @@ let
({ config, ... }: { ({ config, ... }: {
boot.supportedFilesystems = boot.supportedFilesystems =
[ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ] ++ [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ] ++
lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs"; lib.optional (config.networking.hostId != null && lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
networking.hostId = "8425e349";
}) })
(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "23.11" then { (if lib.versionAtLeast (lib.versions.majorMinor lib.version) "23.11" then {

1
tests/cli.nix
View file

@ -5,6 +5,7 @@ diskoLib.testLib.makeDiskoTest {
inherit pkgs; inherit pkgs;
name = "cli"; name = "cli";
disko-config = ../example/complex.nix; disko-config = ../example/complex.nix;
extraInstallerConfig.networking.hostId = "8425e349";
extraSystemConfig = { extraSystemConfig = {
networking.hostId = "8425e349"; networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!

1
tests/complex.nix
View file

@ -5,6 +5,7 @@ diskoLib.testLib.makeDiskoTest {
inherit pkgs; inherit pkgs;
name = "complex"; name = "complex";
disko-config = ../example/complex.nix; disko-config = ../example/complex.nix;
extraInstallerConfig.networking.hostId = "8425e349";
extraSystemConfig = { extraSystemConfig = {
networking.hostId = "8425e349"; networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!

1
tests/module.nix
View file

@ -5,6 +5,7 @@ diskoLib.testLib.makeDiskoTest {
inherit pkgs; inherit pkgs;
name = "module"; name = "module";
disko-config = ../example/complex.nix; disko-config = ../example/complex.nix;
extraInstallerConfig.networking.hostId = "8425e349";
extraSystemConfig = { extraSystemConfig = {
networking.hostId = "8425e349"; networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!

5
tests/zfs-over-legacy.nix
View file

@ -4,9 +4,8 @@
diskoLib.testLib.makeDiskoTest { diskoLib.testLib.makeDiskoTest {
inherit pkgs; inherit pkgs;
name = "zfs-over-legacy"; name = "zfs-over-legacy";
extraSystemConfig = { extraInstallerConfig.networking.hostId = "8425e349";
networking.hostId = "8425e349"; extraSystemConfig.networking.hostId = "8425e349";
};
disko-config = ../example/zfs-over-legacy.nix; disko-config = ../example/zfs-over-legacy.nix;
extraTestScript = '' extraTestScript = ''
machine.succeed("test -e /zfs_fs"); machine.succeed("test -e /zfs_fs");

1
tests/zfs.nix
View file

@ -5,6 +5,7 @@ diskoLib.testLib.makeDiskoTest {
inherit pkgs; inherit pkgs;
name = "zfs"; name = "zfs";
disko-config = ../example/zfs.nix; disko-config = ../example/zfs.nix;
extraInstallerConfig.networking.hostId = "8425e349";
extraSystemConfig = { extraSystemConfig = {
networking.hostId = "8425e349"; networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!