From 9163ef8b28573d045e222400a45faad3e67ecc02 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Wed, 23 Jan 2019 18:32:45 +0500 Subject: [PATCH] Resolve Minio Client conflicts Minio client conflicts with 'mc'/midnight commander. This commit fixes that issue and instead of using mc namespace, it uses 'minio-client' instead. Ticket: #62370 --- build/profiles/fn_head/ports-system.pyd | 5 ++++- build/profiles/freenas/ports-system.pyd | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/profiles/fn_head/ports-system.pyd b/build/profiles/fn_head/ports-system.pyd index 3d7e689..988ff92 100644 --- a/build/profiles/fn_head/ports-system.pyd +++ b/build/profiles/fn_head/ports-system.pyd @@ -385,7 +385,10 @@ ports += "sysutils/consul-alerts" ports += "sysutils/ipfs-go" ports += "security/vault" ports += "www/minio" -ports += "www/minio-client" +ports += { + "name": "www/minio-client", + "options": ["OPTIONS_FILE_UNSET+=MC"] +} ports += "misc/mmv" ports += { "name": "net-mgmt/netdata", diff --git a/build/profiles/freenas/ports-system.pyd b/build/profiles/freenas/ports-system.pyd index 67c0cab..4a04f15 100644 --- a/build/profiles/freenas/ports-system.pyd +++ b/build/profiles/freenas/ports-system.pyd @@ -380,7 +380,10 @@ ports += "converters/convmv" ports += "sysutils/ipfs-go" ports += "www/minio" -#ports += "www/minio-client" +ports += { + "name": "www/minio-client", + "options": ["OPTIONS_FILE_UNSET+=MC"] +} ports += "misc/mmv" ports += { "name": "net-mgmt/netdata",