summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-11-12 14:15:57 +0100
committerlassulus <lass@aidsballs.de>2015-11-12 14:15:57 +0100
commite6b3931daf12830e335e7c0b36082af5695d06df (patch)
tree604152e1f612a13c7e1d00e834a481ec663f5c89 /krebs
parent6295f793579b87333d45efb0e27a7b13a43e3b34 (diff)
parentcdc77bf0bc39f9c815ad5bedd47ac3a372c00315 (diff)
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/4lib/infest/prepare.sh1
-rw-r--r--krebs/default.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh
index 182a068e..0bfc4938 100644
--- a/krebs/4lib/infest/prepare.sh
+++ b/krebs/4lib/infest/prepare.sh
@@ -66,6 +66,7 @@ prepare_debian() {
type bzip2 2>/dev/null || apt-get install bzip2
type git 2>/dev/null || apt-get install git
type rsync 2>/dev/null || apt-get install rsync
+ type curl 2>/dev/null || apt-get install curl
prepare_common
}
diff --git a/krebs/default.nix b/krebs/default.nix
index bfd6175d..ad020542 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -11,6 +11,7 @@ let out = {
inherit infest;
inherit init;
inherit nixos-install;
+ inherit populate;
};
deploy =