summaryrefslogtreecommitdiffstats
path: root/krebs/4lib
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-03-10 14:18:12 +0100
committertv <tv@krebsco.de>2016-03-10 14:18:12 +0100
commitcf416ecd6848a4f9e96126220fe86c50b2e86ca7 (patch)
tree0a40c4ce52279fbf54de3ff847ae934e79a765f0 /krebs/4lib
parent17be0772c5cfcb57f99299ad541b76dfabf8a62d (diff)
parent4ca96e8b04056ae9d06c2ff2e153d2e592991c15 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs/4lib')
-rw-r--r--krebs/4lib/infest/prepare.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh
index a217e7bed..e265b0e67 100644
--- a/krebs/4lib/infest/prepare.sh
+++ b/krebs/4lib/infest/prepare.sh
@@ -98,6 +98,19 @@ prepare_nixos_iso() {
sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install
}
+get_nixos_install() {
+ echo "installing nixos-install" 2>&1
+ c=$(mktemp)
+
+ cat <<EOF > $c
+{ fileSystems."/" = {};
+ boot.loader.grub.enable = false;
+}
+EOF
+ export NIXOS_CONFIG=$c
+ nix-env -i -A config.system.build.nixos-install -f "<nixpkgs/nixos>"
+ rm -v $c
+}
prepare_common() {(
if ! getent group nixbld >/dev/null; then
@@ -191,6 +204,7 @@ prepare_common() {(
mount --rbind /mnt/"$target_path" "$target_path"
fi
+ get_nixos_install
mkdir -p bin
rm -f bin/nixos-install
cp "$(type -p nixos-install)" bin/nixos-install