Unified · Split
| @@ -104,7 +104,12 @@ check_golang_env() { · 103 unmodified lines | |||
| 104 | exit -1 | 104 | exit -1 |
| 105 | fi | 105 | fi |
| 106 | 106 | ||
| 107 | if [ "$(dirname ${go_binary_path})" != "${GOROOT%%*(/)}/bin" ] ; then | 107 | local new_go_binary_path=${go_binary_path} |
| 108 | if [ -h "${go_binary_path}" ]; then | ||
| 109 | new_go_binary_path=$(/bin/readlink -f ${go_binary_path}) | ||
| 110 | fi | ||
| 111 | |||
| 112 | if [[ !"$(dirname ${new_go_binary_path})" =~ *"${GOROOT%%*(/)}"* ]] ; then | ||
| 108 | echo "The go binary found in your PATH configuration does not belong to the Go installation pointed by your GOROOT environment," \ | 113 | echo "The go binary found in your PATH configuration does not belong to the Go installation pointed by your GOROOT environment," \ |
| 109 | "please refer to Go installation document" | 114 | "please refer to Go installation document" |
| 110 | echo "https://github.com/minio/minio/blob/master/INSTALLGO.md#install-go-13" | 115 | echo "https://github.com/minio/minio/blob/master/INSTALLGO.md#install-go-13" |
| @@ -52,7 +52,8 @@ func GetDisks() (Disks, error) { · 51 unmodified lines | |||
| 52 | 52 | ||
| 53 | sysFiles, err := ioutil.ReadDir(sysFSDEVICES) | 53 | sysFiles, err := ioutil.ReadDir(sysFSDEVICES) |
| 54 | if err != nil { | 54 | if err != nil { |
| 55 | return Disks{}, iodine.New(err, nil) | 55 | // may be an amazon instance, ignore this |
| 56 | return Disks{}, nil | ||
| 56 | } | 57 | } |
| 57 | 58 | ||
| 58 | scsidevices = filterdisks(sysFiles) | 59 | scsidevices = filterdisks(sysFiles) |