Skip to content

Commit 1184049

Browse files
committed
tests: rename kexec tarballs to allow compression heuristic
1 parent e07e74b commit 1184049

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

tests/from-nixos-build-on-remote.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
-i /root/.ssh/install_key \
3939
--debug \
4040
--build-on-remote \
41-
--kexec /etc/nixos-anywhere/kexec-installer \
41+
--kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
4242
--store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
4343
root@installed >&2
4444
""")

tests/from-nixos-generate-config.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
nixos-anywhere \
2323
-i /root/.ssh/install_key \
2424
--debug \
25-
--kexec /etc/nixos-anywhere/kexec-installer \
25+
--kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
2626
--disk-encryption-keys /tmp/disk-1.key /tmp/disk-1.key \
2727
--disk-encryption-keys /tmp/disk-2.key <(echo another-secret) \
2828
--phases kexec,disko \
@@ -47,7 +47,7 @@
4747
nixos-anywhere \
4848
-i /root/.ssh/install_key \
4949
--debug \
50-
--kexec /etc/nixos-anywhere/kexec-installer \
50+
--kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
5151
--disk-encryption-keys /tmp/disk-1.key /tmp/disk-1.key \
5252
--disk-encryption-keys /tmp/disk-2.key <(echo another-secret) \
5353
--phases kexec,disko \

tests/from-nixos-separated-phases.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
nixos-anywhere \
2424
-i /root/.ssh/install_key \
2525
--debug \
26-
--kexec /etc/nixos-anywhere/kexec-installer \
26+
--kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
2727
--phases kexec \
2828
--store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
2929
nixos@installed >&2
@@ -46,7 +46,7 @@
4646
--debug \
4747
--phases install \
4848
--store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
49-
root@installed >&2
49+
root@installed >&2
5050
""")
5151
'';
5252
}

tests/from-nixos-with-sudo.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
nixos-anywhere \
2323
-i /root/.ssh/install_key \
2424
--debug \
25-
--kexec /etc/nixos-anywhere/kexec-installer \
25+
--kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
2626
--phases kexec,disko \
2727
--disk-encryption-keys /tmp/disk-1.key /tmp/disk-1.key \
2828
--disk-encryption-keys /tmp/disk-2.key <(echo another-secret) \

tests/from-nixos.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
nixos-anywhere \
4848
-i /root/.ssh/install_key \
4949
--debug \
50-
--kexec /etc/nixos-anywhere/kexec-installer \
50+
--kexec /etc/nixos-anywhere/kexec-installer.tar.gz \
5151
--extra-files /tmp/extra-files \
5252
--store-paths /etc/nixos-anywhere/disko /etc/nixos-anywhere/system-to-install \
5353
--chown /home/user 1000:100 \

tests/modules/installer.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
environment.etc = {
1010
"nixos-anywhere/disko".source = inputs.system-to-install.config.system.build.diskoScriptNoDeps;
1111
"nixos-anywhere/system-to-install".source = inputs.system-to-install.config.system.build.toplevel;
12-
"nixos-anywhere/kexec-installer".source = inputs.kexec-installer;
12+
"nixos-anywhere/kexec-installer.tar.gz".source = inputs.kexec-installer;
1313
};
1414
}

0 commit comments

Comments
 (0)