diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-06-29 18:24:45 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-06-29 18:33:15 +0200 |
commit | d179c1337089f8a62482f5d2916037652ec226de (patch) | |
tree | 039e5c4d91aee04c3c35ce30a6b45c9687830646 /modules | |
parent | 18e5d2918bcce3d2028a5914ca9cae6b363a9cd2 (diff) |
machines: Properly override ISO configuration.
We now do it the exact opposite way than introduced in 27dce7b. Instead of evaluating the machine config and stripping off the options we don't want to conflict with the iso-image.nix module, we now wrap the iso-image.nix module itself and just mkForce the values we don't want to collide. The reason for this is that the previous implementation just didn't work because dependent module options from the machine config (for example config.system.build.*) were already evaluated and thus we end up with overriding configuration options but get an initrd with the machine options (which we actually want to override) instead of the fileSystem/boot options that come with the iso-image.nix module. Although I'm not quite happy with this approach, it's still better than the old one and if iso-image.nix gets conflicting options we at least get a better error message rather than the definitions simply being stripped off. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules')
0 files changed, 0 insertions, 0 deletions