Skip to content

Commit cee1dec

Browse files
committed
Fix exporters
1 parent 365dff2 commit cee1dec

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

nixos/exporters.nix

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323
cloudImageModule = {lib, ...}: {
2424
security.sudo.execWheelOnly = lib.mkForce false;
2525
};
26+
27+
# Some formats configure their own bootloader
28+
noBootloaderModule = {lib, ...}: {
29+
boot.loader.systemd-boot.enable = lib.mkForce false;
30+
boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
31+
};
32+
33+
# LXC containers need special network configuration
34+
lxcModule = {lib, ...}: {
35+
networking.useHostResolvConf = lib.mkForce false;
36+
services.resolved.enable = lib.mkForce true;
37+
};
2638
in {
2739
flake = {
2840
packages.x86_64-linux = {
@@ -49,26 +61,27 @@ in {
4961

5062
linode = mkImage "linode" [
5163
cloudImageModule
64+
noBootloaderModule
5265
];
5366

54-
oracle = mkImage "oracle" [
67+
# Oracle Cloud Infrastructure - using raw-efi format
68+
oracle = mkImage "raw-efi" [
5569
cloudImageModule
5670
];
5771

5872
# Virtualization
5973
vmware = mkImage "vmware" [];
6074
virtualbox = mkImage "virtualbox" [];
6175
proxmox = mkImage "proxmox" [
62-
{
63-
boot.loader.systemd-boot.enable = false;
64-
boot.loader.grub.enable = true;
65-
boot.loader.grub.device = "/dev/sda";
66-
}
76+
noBootloaderModule
6777
];
6878
hyperv = mkImage "hyperv" [];
6979

7080
# Container
71-
lxc = mkImage "lxc" [];
81+
lxc = mkImage "lxc" [
82+
lxcModule
83+
noBootloaderModule
84+
];
7285
};
7386
};
7487
}

0 commit comments

Comments
 (0)