|
12 | 12 | (import ./config.nix args) |
13 | 13 | ]; |
14 | 14 |
|
15 | | - boot.initrd.compressor = "xz"; |
| 15 | + boot.initrd.compressor = "cat"; |
16 | 16 |
|
17 | 17 | # https://github.com/nix-community/nixos-images/blob/main/nix/kexec-installer/module.nix#L50 |
18 | 18 | system.build.kexecInstallerTarball = pkgs.runCommand "kexec-tarball" { } '' |
|
21 | 21 | cp "${config.system.build.kernel}/${config.system.boot.loader.kernelFile}" xnodeos/bzImage |
22 | 22 | cp "${config.system.build.kexecScript}" xnodeos/install |
23 | 23 | cp "${pkgs.pkgsStatic.kexec-tools}/bin/kexec" xnodeos/kexec |
| 24 | + cp "${pkgs.pkgsStatic.coreutils}/bin/mkdir" xnodeos/mkdir |
| 25 | + cp "${pkgs.pkgsStatic.findutils}/bin/find" xnodeos/find |
24 | 26 | cp "${pkgs.pkgsStatic.iproute2.override { iptables = null; }}/bin/ip" xnodeos/ip |
| 27 | + cp "${pkgs.pkgsStatic.cpio}/bin/cpio" xnodeos/cpio |
25 | 28 | tar -czvf $out/xnodeos-kexec-installer-${pkgs.stdenv.hostPlatform.system}.tar.gz xnodeos |
26 | 29 | ''; |
27 | 30 |
|
|
31 | 34 | pkgs.writeScript "kexec-boot" '' |
32 | 35 | #!/usr/bin/env bash |
33 | 36 | SCRIPT_DIR=$( cd -- "$( dirname -- "''${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) |
34 | | - NETWORK_CONFIG="{ \"address\": $(''${SCRIPT_DIR}/ip -j address show), \"route\": $(''${SCRIPT_DIR}/ip -j route show) }" |
35 | | - ''${SCRIPT_DIR}/kexec --load ''${SCRIPT_DIR}/bzImage \ |
36 | | - --initrd=''${SCRIPT_DIR}/initrd \ |
37 | | - --command-line "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} && $(cat << EOF |
38 | 37 |
|
| 38 | + ''${SCRIPT_DIR}/mkdir xnode-config |
| 39 | +
|
| 40 | + NETWORK_CONFIG="{ \"address\": $(''${SCRIPT_DIR}/ip -j address show), \"route\": $(''${SCRIPT_DIR}/ip -j route show) }" |
| 41 | + cat << EOF > xnode-config/env |
39 | 42 | export XNODE_OWNER="''${XNODE_OWNER}" && export DOMAIN="''${DOMAIN}" && export ACME_EMAIL="''${ACME_EMAIL}" && export USER_PASSWD="''${USER_PASSWD}" && export ENCRYPTED="''${ENCRYPTED}" && export NETWORK_CONFIG="''${NETWORK_CONFIG}" && export INITIAL_CONFIG="''${INITIAL_CONFIG}" |
40 | 43 | EOF |
41 | | - )" |
| 44 | +
|
| 45 | + ''${SCRIPT_DIR}/find ./xnode-config -print | ''${SCRIPT_DIR}/cpio -H newc -o -O ./initrd --append |
| 46 | +
|
| 47 | + ''${SCRIPT_DIR}/kexec --load ''${SCRIPT_DIR}/bzImage \ |
| 48 | + --initrd=''${SCRIPT_DIR}/initrd \ |
| 49 | + --command-line "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" |
42 | 50 | ''${SCRIPT_DIR}/kexec -e |
43 | 51 | '' |
44 | 52 | ); |
45 | 53 |
|
46 | 54 | systemd.services.install-xnodeos.script = lib.mkBefore '' |
47 | 55 | # Extract environmental variables |
48 | | - sed '2q;d' /proc/cmdline > /tmp/xnode-env |
49 | | - source /tmp/xnode-env |
| 56 | + source /xnode-config/env |
50 | 57 | ''; |
51 | 58 |
|
52 | 59 | systemd.services.apply-network-config = { |
|
66 | 73 | ]; |
67 | 74 | script = '' |
68 | 75 | # Extract environmental variables |
69 | | - sed '2q;d' /proc/cmdline > /tmp/xnode-env |
70 | | - source /tmp/xnode-env |
| 76 | + source /xnode-config/env |
71 | 77 |
|
72 | 78 | if [[ $NETWORK_CONFIG ]]; then |
73 | 79 | interfaces=$(echo "$NETWORK_CONFIG" | jq -c '.address.[]') |
|
0 commit comments