diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-10-09 11:40:33 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-11-13 23:58:28 +0000 |
| commit | d04bcd86aed029dedcd68af16168921dd93a83a0 (patch) | |
| tree | 902640ddb075132faecfb34d16fd29c74986a2a7 /vm/sys/net/default.nix | |
| parent | 7f785eab13efdc81cd997933f7b2703785e5512e (diff) | |
| download | spectrum-d04bcd86aed029dedcd68af16168921dd93a83a0.tar spectrum-d04bcd86aed029dedcd68af16168921dd93a83a0.tar.gz spectrum-d04bcd86aed029dedcd68af16168921dd93a83a0.tar.bz2 spectrum-d04bcd86aed029dedcd68af16168921dd93a83a0.tar.lz spectrum-d04bcd86aed029dedcd68af16168921dd93a83a0.tar.xz spectrum-d04bcd86aed029dedcd68af16168921dd93a83a0.tar.zst spectrum-d04bcd86aed029dedcd68af16168921dd93a83a0.zip | |
vm: build GPT images
This will allow booting reliably from multiple disk images, without relying on order or requiring udev in an initramfs. (The only deterministic way of doing boot order on Linux without special userspace support is to set "root" on the kernel command line to either a GPT partition UUID or label.) Signed-off-by: Alyssa Ross <hi@alyssa.is> Message-Id: <20221009114036.463071-4-hi@alyssa.is>
Diffstat (limited to 'vm/sys/net/default.nix')
| -rw-r--r-- | vm/sys/net/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index dfc7c35..e9a2f05 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> +# SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> { config ? import ../../../nix/eval-config.nix {} , terminfo ? config.pkgs.foot.terminfo @@ -8,7 +8,7 @@ config.pkgs.pkgsStatic.callPackage ( { lib, stdenvNoCC, runCommand, writeReferencesToFile, buildPackages -, s6-rc, tar2ext4, xorg +, jq, s6-rc, tar2ext4, util-linux, xorg , busybox, connmanMinimal, dbus, execline, kmod, mdevd, nftables, s6 , s6-linux-init }: @@ -16,6 +16,8 @@ config.pkgs.pkgsStatic.callPackage ( let inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix; + scripts = import ../../../scripts { inherit config; }; + connman = connmanMinimal; packages = [ @@ -80,11 +82,13 @@ stdenvNoCC.mkDerivation { src = cleanSource ./.; }; - nativeBuildInputs = [ s6-rc tar2ext4 ]; + nativeBuildInputs = [ jq s6-rc tar2ext4 util-linux ]; PACKAGES_TAR = packagesTar; VMLINUX = "${kernel.dev}/vmlinux"; + makeFlags = [ "SCRIPTS=${scripts}" ]; + installPhase = '' mv build/svc $out ''; |