Fix network-online (#55)

* Fix network-online

* Fix new image build

* Update flake lock to point to master. Fixes repart build

* fix test

.github/workflows/ci.yml

@@ -22,4 +22,3 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@8a218f9e264e9c3803c9a1ee1c30d8e4ab55be63 # v2
       - run: nix build .#amazonImage -L --system ${{ matrix.runs-on.system }}
       - run: nix flake check -L --system ${{ matrix.runs-on.system }}
-        if: ${{ matrix.runs-on.system != 'aarch64-linux' }}

flake.nix

@@ -2,7 +2,7 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs";
   };
 
   outputs = { self, nixpkgs, ... }:

modules/amazon-image.nix

@@ -13,13 +13,13 @@ in
     pkgs.runCommand config.system.build.image.name { } ''
       mkdir -p $out
       mkdir -p $out/nix-support
-      ${pkgs.qemu-utils}/bin/qemu-img convert -f raw -O vpc ${config.system.build.image}/image.raw $out/image.vhd
+      ${pkgs.qemu-utils}/bin/qemu-img convert -f raw -O vpc ${config.system.build.image}/${config.image.repart.imageFile} $out/${config.image.repart.imageFileBasename}.vhd
       cat <<EOF > $out/nix-support/image-info.json
       {
         "boot_mode": "uefi",
         "label": "${config.system.nixos.label}",
         "system": "${pkgs.stdenv.hostPlatform.system}",
-        "file": "$out/image.vhd"
+        "file": "$out/${config.image.repart.imageFileBasename}.vhd"
       }
       EOF
     '';

modules/amazon-profile.nix

@@ -40,6 +40,7 @@
 
   systemd.services.ec2-metadata = {
     description = "Fetch EC2 metadata and set up ssh keys for ec2-user";
+    wants =  [ "network-online.target" ];
     after = [ "network-online.target" ];
     wantedBy = [ "multi-user.target" ];
 

tests/resize-partition.nix

@@ -21,7 +21,7 @@
       "-f",
       "qcow2",
       "-b",
-      "${nodes.machine.system.build.image}/image.raw",
+      "${nodes.machine.system.build.image}/${nodes.machine.image.repart.imageFile}",
       "-F",
       "raw",
       tmp_disk_image.name,