diff options
| author | tv <tv@krebsco.de> | 2017-06-29 23:51:16 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-06-29 23:51:22 +0200 |
| commit | 0d9ded0b58b79fd35fa14f41726d9f8a4aa4a78e (patch) | |
| tree | 8997ba01fb44260dd7b5f3fbf6709087de2b6618 | |
| parent | ed71d568831941632d2fa6e783d10d703c4ceee6 (diff) | |
Revert "k 4 infest: prepare Regression for stockholm"
This reverts commit d58e8035b4101b20539279247ec083b72ba0a647.
| -rw-r--r-- | krebs/4lib/infest/prepare.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh index 8e921ce06..50d521e17 100644 --- a/krebs/4lib/infest/prepare.sh +++ b/krebs/4lib/infest/prepare.sh @@ -36,7 +36,14 @@ prepare() {( ;; esac ;; - nixos|stockholm) + nixos) + case $(cat /proc/cmdline) in + *' root=LABEL=NIXOS_ISO '*) + prepare_nixos_iso "$@" + exit + esac + ;; + stockholm) case $(cat /proc/cmdline) in *' root=LABEL=NIXOS_ISO '*) prepare_nixos_iso "$@" @@ -95,8 +102,7 @@ prepare_nixos_iso() { mkdir -p bin rm -f bin/nixos-install cp "$(type -p nixos-install)" bin/nixos-install - sed -i 's@^\(\(export \|\)NIX_PATH\)=\"[^\"]*\"@\1=$target_path@' bin/nixos-install - + sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install } get_nixos_install() { @@ -211,7 +217,7 @@ prepare_common() {( mkdir -p bin rm -f bin/nixos-install cp "$(type -p nixos-install)" bin/nixos-install - sed -i 's@^\(\(export \|\)NIX_PATH\)=\"[^\"]*\"@\1=$target_path@' bin/nixos-install + sed -i "s@^NIX_PATH=\"[^\"]*\"@NIX_PATH=$target_path@" bin/nixos-install if ! grep -q '^PATH.*#krebs' .bashrc; then echo '. /root/.nix-profile/etc/profile.d/nix.sh' >> .bashrc |