Move Manage User to Required options; secure root in bare-metal-install-server (#874)

* Move Manage User to Required options; secure root in bare-metal-install-server.

- Align with clr-installer merged PR: https://github.com/clearlinux/clr-installer/pull/576
- Replace Figures 18-21 to reflect TUI with Admin selected by default
- Renumber all figures after 18 and reassign
- Add note to Manage User re requirement to assign Admin to proceed.

Signed-off-by: Michael Vincerra <michael.vincerra@intel.com>

* test new machine settings.

Signed-off-by: Michael Vincerra <michael.vincerra@intel.com>

source/get-started/bare-metal-install-server.rst

@@ -468,6 +468,99 @@ be configured post-installation using the ``cryptsetup`` tool.
 
       :guilabel:`Confirm` is only highlighted if passphrases match.
 
+Manage User
+===========
+
+Add New User
+------------
+
+#. In Required Options, select :guilabel:`Manage User`.
+
+#. Select :guilabel:`Add New User` as shown in Figure 18.
+
+   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-18.png
+      :scale: 100%
+      :alt: Add New User, User Name
+
+      Figure 18: Add New User
+
+#. Optional: Enter a :guilabel:`User Name`.
+
+   .. note:
+
+      The User Name must be alphanumeric and can include spaces, commas, underscores or hyphens. Maximum length is 64 characters.
+
+   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-19.png
+      :scale: 100%
+      :alt: User Name
+
+      Figure 19: User Name
+
+#. Enter a :guilabel:`Login`.
+
+   .. note::
+
+      The User Login must be alphanumeric and can include hyphens and underscores. Maximum length is 31 characters.
+
+#. Enter a :guilabel:`Password`.
+
+   .. note:
+
+      Minimum length is 8 characters. Maximum length is 255 characters.
+
+#. In :guilabel:`Confirm`, enter the same password.
+
+#. The :guilabel:`Administrator` checkbox is selected by default.
+
+   .. note::
+
+      Selecting Administrator enables sudo privileges for the user. For the installation to proceed, at least one user must be assigned as an Administrator.
+
+#. Select :kbd:`Confirm`. To reset the form, select :guilabel:`Reset`.
+
+#. In :guilabel:`Manage User`, navigate to :guilabel:`Confirm`.
+
+#. With :guilabel:`Confirm` highlighted, select :kbd:`Enter`.
+
+Modify / Delete User
+--------------------
+
+#. In :guilabel:`Manage User`, navigate to the user you wish
+   to modify until highlighted, as shown in Figure 20.
+
+#. Select :kbd:`Enter` to modify the user.
+
+   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-20.png
+      :scale: 100%
+      :alt: Modify User
+
+      Figure 20: Modify User
+
+#. Modify user details as desired.
+
+#. Navigate to :kbd:`Confirm` until highlighted.
+
+   .. note::
+
+      Optional: Select :guilabel:`Reset` to rest the form.
+
+#. Select :guilabel:`Confirm` to save the changes you made.
+
+#. Optional: In :guilabel:`Modify User`, to delete the user, navigate to
+   the :guilabel:`Delete` button and select :kbd:`Enter`.
+
+   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-21.png
+      :scale: 100%
+      :alt: Delete User
+
+      Figure 21: Delete User
+
+You are returned to :guilabel:`Manage User`.
+
+#. Navigate to :kbd:`Confirm` until highlighted.
+
+#. Select :guilabel:`Enter` to complete :guilabel:`Manage User` options.
+
 Telemetry
 =========
 
@@ -483,19 +576,18 @@ Select your desired option on whether to participate in telemetry.
 
 #. Select :kbd:`Enter` to confirm.
 
-   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-18.png
+   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-22.png
       :scale: 100%
       :alt: Enable Telemetry
 
-      Figure 18: Enable Telemetry
+      Figure 22: Enable Telemetry
 
 Recommended options
 *******************
 
 After you complete the `Required options`_, we highly recommend completing
-these selected `Advanced options`_ at minimum:
+some `Advanced options`_:
 
-* `Manage User`_ Assign a new user with administrative rights
 * `Assign Hostname`_ Simplify your development environment
 
 Skip to finish installation
@@ -533,22 +625,22 @@ interface settings are automatically applied.
 
    .. note:: Multiple network interfaces may appear.
 
-   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-19.png
+   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-23.png
       :scale: 100%
       :alt: Configure Network Interfaces
 
-      Figure 19: Configure Network Interfaces
+      Figure 23: Configure Network Interfaces
 
 #. Notice :guilabel:`Automatic / dhcp` is selected by default (at bottom).
 
    Optional: Navigate to the checkbox :guilabel:`Automatic / dhcp` and select
    :kbd:`Spacebar` to deselect.
 
-   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-20.png
+   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-24.png
       :scale: 100%
       :alt: Network interface configuration
 
-      Figure 20: Network interface configuration
+      Figure 24: Network interface configuration
 
 #. Navigate to the appropriate fields and assign the desired
    network configuration.
@@ -584,11 +676,11 @@ instruction.
 
 #. Navigate to the field :guilabel:`HTTPS Proxy`.
 
-   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-21.png
+   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-25.png
       :scale: 100%
       :alt: Configure the network proxy
 
-      Figure 21: Configure the network proxy
+      Figure 25: Configure the network proxy
 
 #. Enter the desired proxy address and port using conventional syntax,
    such as: \http://address:port.
@@ -609,13 +701,13 @@ select :guilabel:`Test Network Settings` and select :guilabel:`Enter`.
 .. note::
    If using the :command:`off-line installer`, this option is not available.
 
-A progress bar appears as shown in Figure 22.
+A progress bar appears as shown in Figure 26.
 
-.. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-22.png
+.. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-26.png
    :scale: 100%
    :alt: Testing Networking dialog
 
-   Figure 22: Testing Networking dialog
+   Figure 26: Testing Networking dialog
 
 .. note::
 
@@ -636,11 +728,11 @@ Bundle selection is disabled if no network connection exists.
 
 #. Select :kbd:`Spacebar` to select the checkbox for each desired bundle.
 
-   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-23.png
+   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-27.png
       :scale: 100%
       :alt: Bundle Selection
 
-      Figure 23: Bundle Selection
+      Figure 27: Bundle Selection
 
 #. Optional: To start developing with |CL|, we recommend
    adding :file:`os-clr-on-clr`.
@@ -651,107 +743,6 @@ Bundle selection is disabled if no network connection exists.
 
 Optional: Skip to `Finish installation`_.
 
-Manage User
-===========
-
-Add New User
-------------
-
-#. In Advanced Options, select :guilabel:`Manage User`.
-
-#. Select :guilabel:`Add New User` as shown in Figure 24.
-
-   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-24.png
-      :scale: 100%
-      :alt: Add New User, User Name
-
-      Figure 24: Add New User
-
-#. Optional: Enter a :guilabel:`User Name`.
-
-   .. note:
-
-      The User Name must be alphanumeric and can include spaces, commas, or
-      hyphens. Maximum length is 64 characters.
-
-   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-25.png
-      :scale: 100%
-      :alt: User Name
-
-      Figure 25: User Name
-
-#. Enter a :guilabel:`Login`.
-
-   .. note::
-
-      The User Login must be alphanumeric and can include hyphens and underscores. Maximum length is 31 characters.
-
-#. Enter a :guilabel:`Password`.
-
-   .. note:
-
-      Minimum length is 8 characters. Maximum length is 255 characters.
-
-#. In :guilabel:`Confirm`, enter the same password.
-
-#. Optional: Navigate to the :guilabel:`Administrative` checkbox and select
-   :kbd:`Spacebar` to assign administrative rights to the user.
-
-   .. note::
-
-      Selecting this option enables sudo privileges for the user.
-
-#. Select :kbd:`Confirm`.
-
-   .. note::
-
-      If desired, select :guilabel:`Reset` to reset the form.
-
-#. In :guilabel:`Manage User`, navigate to :guilabel:`Confirm`.
-
-#. With :guilabel:`Confirm` highlighted, select :kbd:`Enter`.
-
-Modify / Delete User
---------------------
-
-#. In :guilabel:`Manage User`, navigate to the user you wish
-   to modify until highlighted, as shown in Figure 26.
-
-#. Select :kbd:`Enter` to modify the user.
-
-   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-26.png
-      :scale: 100%
-      :alt: Modify User
-
-      Figure 26: Modify User
-
-#. Modify user details as desired.
-
-#. Navigate to :kbd:`Confirm` until highlighted.
-
-   .. note::
-
-      Optional: Select :guilabel:`Reset` to rest the form.
-
-#. Select :guilabel:`Confirm` to save the changes you made.
-
-#. Optional: In :guilabel:`Modify User`, to delete the user, navigate to
-   the :guilabel:`Delete` button and select :kbd:`Enter`.
-
-   .. figure:: /_figures/bare-metal-install-server/bare-metal-install-server-27.png
-      :scale: 100%
-      :alt: Delete User
-
-      Figure 27: Delete User
-
-You are returned to :guilabel:`Manage User`.
-
-#. Navigate to :kbd:`Confirm` until highlighted.
-
-#. Select :guilabel:`Enter` to complete :guilabel:`Manage User` options.
-
-Optional: Skip to `Finish installation`_.
-
 Kernel Command Line
 ===================
 
@@ -952,3 +943,4 @@ entering :guilabel:`Configure Installation Media`:
   - macOS\* platform: :command:`diskutil list`
 
 .. _Downloads: https://clearlinux.org/downloads
+