diff options
| author | makefu <github@syntax-fehler.de> | 2015-10-23 15:38:01 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-10-23 15:38:01 +0200 |
| commit | a1d05482e5527d32baef9d9343b900dee8d46694 (patch) | |
| tree | 2de3ac509481799f6188620987cdf1678ea675a5 /krebs/4lib | |
| parent | 709ebf6bbcc2e0d4644ed35cd42db47c4f2e78c5 (diff) | |
| parent | 93dcfe5ad61903f90f422d9d6c97e499b240aa86 (diff) | |
Merge remote-tracking branch 'cloudkrebs/master'
Diffstat (limited to 'krebs/4lib')
| -rw-r--r-- | krebs/4lib/default.nix | 2 | ||||
| -rw-r--r-- | krebs/4lib/infest/finalize.sh | 2 | ||||
| -rw-r--r-- | krebs/4lib/infest/prepare.sh | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix index 0a6101314..396307c22 100644 --- a/krebs/4lib/default.nix +++ b/krebs/4lib/default.nix @@ -3,8 +3,6 @@ with builtins; with lib; -builtins // -lib // rec { eq = x: y: x == y; diff --git a/krebs/4lib/infest/finalize.sh b/krebs/4lib/infest/finalize.sh index 0039960c5..94b13e0be 100644 --- a/krebs/4lib/infest/finalize.sh +++ b/krebs/4lib/infest/finalize.sh @@ -3,8 +3,8 @@ set -eux { umount /mnt/nix umount /mnt/root - umount /boot || : umount /mnt/boot + umount /boot || : umount /mnt coreutils_path=$(set +f; for i in /nix/store/*coreutils*/bin; do :; done; echo $i) diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh index 9fbd5be86..94c9b0fb5 100644 --- a/krebs/4lib/infest/prepare.sh +++ b/krebs/4lib/infest/prepare.sh @@ -18,6 +18,13 @@ prepare() {( esac ;; esac + elif test -e /etc/centos-release; then + case $(cat /etc/centos-release) in + 'CentOS release 6.5 (Final)') + prepare_centos "$@" + exit + ;; + esac fi echo "$0 prepare: unknown OS" >&2 exit -1 |