From 0e736d16c9eb45281c3a0c6a6e76e04f6fb0916c Mon Sep 17 00:00:00 2001 From: Tom Leavitt <30448839+tpleavitt@users.noreply.github.com> Date: Wed, 11 Oct 2017 15:47:16 -0700 Subject: [PATCH] Updated cross-references and fixed minor issues Updated get-started.rst to add references to bare-metal-* files Update cross-reference in bare-metal-manual and cgdisk-manual-install files. Fixed minor issues within content Signed-off-by: Tom Leavitt <30448839+tpleavitt@users.noreply.github.com> --- .../bare-metal-install/bare-metal-install.rst | 10 +++++----- .../bare-metal-manual-install.rst | 16 ++++++---------- .../bare-metal-install/cgdisk-manual-install.rst | 8 +++++--- source/clear-linux/get-started/get-started.rst | 2 ++ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst b/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst index 7c15419b..13f63c04 100644 --- a/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst +++ b/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst @@ -211,8 +211,8 @@ additional tasks during |CL| Installer setup: If you want to perform any of these additional tasks, select the :guilabel:`< Manual(Advanced) >` menu item and follow the steps in our -:ref:`bare-metal-manual-install` to complete the |CL| installation process. -Otherwise you can follow the automatic installation steps outlined below. +:ref:`bare-metal-manual-install` to complete the |CL| manual installation +process. Otherwise you can follow the |CL| automatic installation steps. Clear Linux automatic installation ********************************** @@ -249,9 +249,9 @@ When you are satisfied with the information you have entered, select the |CL| Installation begins and each step shows its status as it progresses through the automated installation process. -Once all steps have completed, you will see the ``Successful installation`` -status message and the :guilabel:`< Ok >` button is highlighted as shown in -figure 10. Press the :kbd:`Enter` key to continue. +Once all steps have completed, you will see the `:guilabel:`Successful +installation` status message and the :guilabel:`< Ok >` button is highlighted +as shown in figure 10. Press the :kbd:`Enter` key to continue. .. figure:: figures/caisuccess.png :scale: 50 % diff --git a/source/clear-linux/get-started/bare-metal-install/bare-metal-manual-install.rst b/source/clear-linux/get-started/bare-metal-install/bare-metal-manual-install.rst index 404ef4a1..0117546a 100644 --- a/source/clear-linux/get-started/bare-metal-install/bare-metal-manual-install.rst +++ b/source/clear-linux/get-started/bare-metal-install/bare-metal-manual-install.rst @@ -43,17 +43,13 @@ Begin the manual installation process device >` menu item and press :kbd:`Enter` to move to the next step of the installer setup process. + .. _cgdisk-manual-setup: + Otherwise, to set up your hard drive partitions manually before moving to the next step, select the :guilabel:`< Manually configure mounts and partitions >` menu item and follow the instructions for :ref:`using CGDISK to set up your Clear Linux hard drive`. - .. toctree:: - :maxdepth: 1 - - cgdisk-manual-install - - .. _choose-target-device: Choose target device for installation @@ -82,7 +78,7 @@ to install |CL| onto. #. After selecting the :guilabel:`< Partition /dev/sda >` button you will be presented with a warning screen as shown in figure 4 with the - :guilabel:`< No >` button highlighted. If you are satisfied this is the + :guilabel:`< No >` button highlighted. If you are satisfied this is the device that you want to install |CL| onto, use the :kbd:`Tab` key to highlight the :guilabel:`< Yes >` button and press :kbd:`Enter` to proceed to the next step. @@ -150,9 +146,9 @@ bundles and optionally create a static IP address for your system. #. To create a user you will be presented with the second :guilabel:`User configuration` menu shown in figure 8. You are only required to fill in the :guilabel:`Username`, :guilabel:`Password` and :guilabel:`Confirm password` - fields. To give this user administrative privileges, select the + fields. To give this user administrative privileges, select the :guilabel:`Add user to the sudoers?` field to add this user to the - ``wheel`` group. This will enable using the :command:`sudo` command for + ``wheel`` group. This will enable using the :command:`sudo` command for this new user. Once you have entered all the data for this menu, press the :kbd:`Tab` key @@ -187,7 +183,7 @@ Target system network configuration The final step of the installer setup process before the actual installation of |CL| begins, is to set up the :guilabel:`Network configuration`. This menu -is shown in figure 10. For this guide installation we will select +is shown in figure 10. For this guide installation we will select :guilabel:`< Use DHCP >` to have an IP address automatically assigned when the system boots up. diff --git a/source/clear-linux/get-started/bare-metal-install/cgdisk-manual-install.rst b/source/clear-linux/get-started/bare-metal-install/cgdisk-manual-install.rst index bcc51edb..ec7112e2 100755 --- a/source/clear-linux/get-started/bare-metal-install/cgdisk-manual-install.rst +++ b/source/clear-linux/get-started/bare-metal-install/cgdisk-manual-install.rst @@ -3,9 +3,11 @@ Clear Linux partitioning using CGDISK ##################################### -These instructions will guide you through the initial setup of your hard drive +These instructions guide you through the initial setup of your hard drive partitions using the :command:`cgdisk` utility as part of the |CL| manual -installation process. +installation process. If you do not wish to continue creating your own +partitions, :ref:`return to the bare metal manual installation +`. Prerequisites ************* @@ -242,7 +244,7 @@ In this menu you will need to set the mount points for the boot and root partitions and select to format them. #. Highlight the EFI System partition type menu entry and press the - :kbd:`Enter` key to edit this item. The :guilabel:`Set mount point of + :kbd:`Enter` key to edit this item. The :guilabel:`Set mount point of sda1` menu will be shown and you will need to enter the following information to set the mount to the :file:`/boot` directory entry and enable formatting the partition by checking the :guilabel:`[ ] Format` diff --git a/source/clear-linux/get-started/get-started.rst b/source/clear-linux/get-started/get-started.rst index ad5149e0..f08f435f 100644 --- a/source/clear-linux/get-started/get-started.rst +++ b/source/clear-linux/get-started/get-started.rst @@ -16,6 +16,8 @@ information and instructions on how to complete pre-install tasks. ../reference/system-requirements bare-metal-install/bare-metal-install + bare-metal-install/bare-metal-manual-install + bare-metal-install/cgdisk-manual-install virtual-machine-install/virtual-machine-install live-image compatibility-check