summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-01-09 22:07:04 +0100
committerjeschli <jeschli@gmail.com>2018-01-09 22:07:04 +0100
commit794e4fe21b9d0841f80ecab184716fbf88328aed (patch)
tree443cb7196a915151ce49b69ffc75da534ca2b0c5
parent4c0e2b269f6f2df9725cca59e151f6c39b593fdb (diff)
infest prepare: no subshell for _prepare*prism/staging/jeschli-hetzner
-rw-r--r--krebs/4lib/infest/prepare.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh
index ff1ab1fb7..78c1c6ec1 100644
--- a/krebs/4lib/infest/prepare.sh
+++ b/krebs/4lib/infest/prepare.sh
@@ -194,7 +194,7 @@ prepare_common() {(
_prepare_nixos_install
)}
-_prepare_nix() {(
+_prepare_nix() {
# install nix on host (cf. https://nixos.org/nix/install)
if ! test -e /root/.nix-profile/etc/profile.d/nix.sh; then
(
@@ -219,9 +219,9 @@ _prepare_nix() {(
if ! mountpoint "$target_path"; then
mount --rbind /mnt/"$target_path" "$target_path"
fi
-)}
+}
-_prepare_nix_users() {(
+_prepare_nix_users() {
if ! getent group nixbld >/dev/null; then
groupadd -g 30000 -r nixbld
fi
@@ -238,7 +238,7 @@ _prepare_nix_users() {(
nixbld$i
fi
done
-)}
+}
_prepare_nixos_install() {