Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

infest prepare: no subshell for _prepare*

Browse Source
This commit is contained in:
jeschli 2018-01-09 22:07:04 +01:00
parent 4c0e2b269f
commit 794e4fe21b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
krebs/4lib/infest/prepare.sh
View File

@ -194,7 +194,7 @@ prepare_common() {(
_prepare_nixos_install _prepare_nixos_install
)} )}
_prepare_nix() {( _prepare_nix() {
# install nix on host (cf. https://nixos.org/nix/install) # install nix on host (cf. https://nixos.org/nix/install)
if ! test -e /root/.nix-profile/etc/profile.d/nix.sh; then if ! test -e /root/.nix-profile/etc/profile.d/nix.sh; then
( (
@ -219,9 +219,9 @@ _prepare_nix() {(
if ! mountpoint "$target_path"; then if ! mountpoint "$target_path"; then
mount --rbind /mnt/"$target_path" "$target_path" mount --rbind /mnt/"$target_path" "$target_path"
fi fi
)} }
_prepare_nix_users() {( _prepare_nix_users() {
if ! getent group nixbld >/dev/null; then if ! getent group nixbld >/dev/null; then
groupadd -g 30000 -r nixbld groupadd -g 30000 -r nixbld
fi fi
@ -238,7 +238,7 @@ _prepare_nix_users() {(
nixbld$i nixbld$i
fi fi
done done
)} }
_prepare_nixos_install() { _prepare_nixos_install() {