kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

fix proxmox-provision.sh

Browse source 
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
Kiara Grouwstra 2025-09-18 19:11:58 +02:00
parent 3fd61aea5b
commit 6eb27c06e2
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
infra/makeInstallerIso.nix
View file

@ -5,9 +5,9 @@
*/ */
{ {
nixpkgs,
hostKeys ? { },
nixosConfiguration, nixosConfiguration,
hostKeys ? { },
nixpkgs ? (import ../npins).nixpkgs,
}: }:
let let
@ -44,7 +44,7 @@ let
imports = [ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" ]; imports = [ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" ];
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
services.getty.autologinUser = lib.mkForce "root"; services.getty.autologinUser = lib.mkForce "root";
programs.bash.loginShellInit = nixpkgs.lib.getExe bootstrap; programs.bash.loginShellInit = lib.getExe bootstrap;
isoImage = { isoImage = {
compressImage = false; compressImage = false;
@ -55,4 +55,10 @@ let
}; };
}; };
in in
(nixpkgs.lib.nixosSystem { modules = [ installer ]; }).config.system.build.isoImage (import "${nixpkgs}/nixos/lib/eval-config.nix" {
modules = [ installer ];
# Allow system to be set modularly in nixpkgs.system.
# We set it to null, to remove the "legacy" entrypoint's
# non-hermetic default.
system = null;
}).config.system.build.isoImage

6
infra/proxmox-provision.sh
View file

@ -223,9 +223,9 @@ build_iso () {
nix build \ nix build \
--impure --expr " --impure --expr "
let flake = builtins.getFlake (builtins.toString ./.); in let flake = builtins.getFlake (builtins.toString ./.); in
import ./makeInstallerIso.nix { import ./infra/makeInstallerIso.nix {
nixosConfiguration = flake.nixosConfigurations.$vm_name; nixosConfiguration = flake.nixosConfigurations.$vm_name;
nixpkgs = flake.inputs.nixpkgs; # FIXME pass nixpkgs from npins
$nix_host_keys $nix_host_keys
} }
" \ " \
@ -239,7 +239,7 @@ Check the Nix logs and fix things. Possibly there just is no NixOS configuration
"$vm_name" "$vm_name"
fi fi
ln -sf "$tmpdir/installer-$vm_name/iso/installer.iso" "$tmpdir/installer-$vm_name.iso" ln -sf "$(ls "$tmpdir/installer-$vm_name"/iso/nixos-*.iso)" "$tmpdir/installer-$vm_name.iso"
printf 'done building ISO for VM %s.\n' "$vm_name" printf 'done building ISO for VM %s.\n' "$vm_name"
release_lock build release_lock build