From 721625c297c46f3e5b574aca41f01bd62452d237 Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Mon, 20 Apr 2020 03:49:46 +0000 Subject: [PATCH] Clarify the wording of centos installation CentOS might or might not install binary to /usr/bin/, depending on versions. Let's rephrase the instruction to make it clear. Change-Id: I517ac510c3fbc8a6c48631d24e68e858b5fa5168 --- doc/source/install/compute-install.rst | 20 +++++++++++--------- doc/source/install/controller-install.rst | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/doc/source/install/compute-install.rst b/doc/source/install/compute-install.rst index c4fa6c022..64f23aaeb 100644 --- a/doc/source/install/compute-install.rst +++ b/doc/source/install/compute-install.rst @@ -98,8 +98,8 @@ Install and configure components .. note:: - CentOS install binary files into ``/usr/bin/``, - replace ``/usr/local/bin/`` directory with the correct + CentOS might install binary files into ``/usr/bin/``. + If it does, replace ``/usr/local/bin/`` directory with the correct in the following command. .. code-block:: console @@ -302,9 +302,11 @@ Install and configure components # install -o zun -m 0555 -D /usr/local/bin/zun-cni /opt/cni/bin/zun-cni - CentOS install binary files into ``/usr/bin/``, - replace ``/usr/local/bin/zun-cni`` with the correct path - in the command above. + .. note:: + + CentOS might install binary files into ``/usr/bin/``. + If it does, replace ``/usr/local/bin/zun-cni`` with the correct path + in the command above. Finalize installation --------------------- @@ -314,8 +316,8 @@ Finalize installation .. note:: - CentOS install binary files into ``/usr/bin/``, - replace ``/usr/local/bin/`` directory with the correct + CentOS might install binary files into ``/usr/bin/``. + If it does, replace ``/usr/local/bin/`` directory with the correct in the following example file. .. code-block:: bash @@ -335,8 +337,8 @@ Finalize installation .. note:: - CentOS install binary files into ``/usr/bin/``, - replace ``/usr/local/bin/`` directory with the correct + CentOS might install binary files into ``/usr/bin/``, + If it does, replace ``/usr/local/bin/`` directory with the correct in the following example file. .. code-block:: bash diff --git a/doc/source/install/controller-install.rst b/doc/source/install/controller-install.rst index 29c5f993e..cf8aaa0d1 100644 --- a/doc/source/install/controller-install.rst +++ b/doc/source/install/controller-install.rst @@ -346,8 +346,8 @@ Finalize installation .. note:: - CentOS install binary files into ``/usr/bin/``, - replace ``/usr/local/bin/`` directory with the correct + CentOS might install binary files into ``/usr/bin/``. + If it does, replace ``/usr/local/bin/`` directory with the correct in the following example files. .. code-block:: bash