diff options
| author | Alan Somers <asomers@gmail.com> | 2017-09-25 23:01:49 +0200 |
|---|---|---|
| committer | Alan Somers <asomers@gmail.com> | 2017-09-26 00:24:06 +0200 |
| commit | 44c6a47fb6208eae8be88197cd2bf7240759a05a (patch) | |
| tree | 002d6a64661a88f5f75745ef7f8478158942aa7d /do_freebsd.sh | |
| parent | Merge pull request #17322 from liewegas/wip-post-luminous-mon (diff) | |
| download | ceph-44c6a47fb6208eae8be88197cd2bf7240759a05a.tar.xz ceph-44c6a47fb6208eae8be88197cd2bf7240759a05a.zip | |
do_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD
Use sysctl(8) instead. Also, there's no longer any need for /bin/bash
on FreeBSD.
Signed-off-by: Alan Somers <asomers@gmail.com>
Diffstat (limited to 'do_freebsd.sh')
| -rwxr-xr-x | do_freebsd.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/do_freebsd.sh b/do_freebsd.sh index bf9007488f0..2cfa8fa6a7c 100755 --- a/do_freebsd.sh +++ b/do_freebsd.sh @@ -1,14 +1,6 @@ #!/bin/sh -xve -NPROC=`sysctl -n hw.ncpu` +export NPROC=`sysctl -n hw.ncpu` -# we need bash first otherwise almost nothing will work -if [ ! -L /bin/bash ]; then - echo install bash and link /bin/bash to /usr/local/bin/bash - echo Run: - echo sudo pkg install bash - echo ln -s /usr/local/bin/bash /bin/bash - exit 1 -fi if [ x"$1"x = x"--deps"x ]; then sudo ./install-deps.sh fi |