From 35082e2787aa9075c0fa39bf1a7d8c82468ec914 Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Mon, 23 Apr 2018 14:13:59 -0400 Subject: [PATCH] Implemented structural feedback in multi-boot.rst. Text edits deferred to next phase of updates. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reordered text and included CL details in multi-boot.rst. Renamed “reset-bl” file references to “restore-bl” for clarity. Signed-off-by: MCamp859 --- ...t-bl-1.png => multi-boot-restore-bl-1.png} | Bin ...t-bl-2.png => multi-boot-restore-bl-2.png} | Bin .../tutorials/multi-boot/multi-boot-cl.rst | 172 --------------- .../tutorials/multi-boot/multi-boot-mint.rst | 2 +- ...reset-bl.rst => multi-boot-restore-bl.rst} | 8 +- .../tutorials/multi-boot/multi-boot-rhel.rst | 2 +- .../tutorials/multi-boot/multi-boot-sles.rst | 2 +- .../multi-boot/multi-boot-ubuntu.rst | 2 +- .../tutorials/multi-boot/multi-boot-win.rst | 2 +- .../tutorials/multi-boot/multi-boot.rst | 204 ++++++++++++++++-- 10 files changed, 197 insertions(+), 197 deletions(-) rename source/clear-linux/tutorials/multi-boot/figures/{multi-boot-reset-bl-1.png => multi-boot-restore-bl-1.png} (100%) rename source/clear-linux/tutorials/multi-boot/figures/{multi-boot-reset-bl-2.png => multi-boot-restore-bl-2.png} (100%) delete mode 100644 source/clear-linux/tutorials/multi-boot/multi-boot-cl.rst rename source/clear-linux/tutorials/multi-boot/{multi-boot-reset-bl.rst => multi-boot-restore-bl.rst} (87%) diff --git a/source/clear-linux/tutorials/multi-boot/figures/multi-boot-reset-bl-1.png b/source/clear-linux/tutorials/multi-boot/figures/multi-boot-restore-bl-1.png similarity index 100% rename from source/clear-linux/tutorials/multi-boot/figures/multi-boot-reset-bl-1.png rename to source/clear-linux/tutorials/multi-boot/figures/multi-boot-restore-bl-1.png diff --git a/source/clear-linux/tutorials/multi-boot/figures/multi-boot-reset-bl-2.png b/source/clear-linux/tutorials/multi-boot/figures/multi-boot-restore-bl-2.png similarity index 100% rename from source/clear-linux/tutorials/multi-boot/figures/multi-boot-reset-bl-2.png rename to source/clear-linux/tutorials/multi-boot/figures/multi-boot-restore-bl-2.png diff --git a/source/clear-linux/tutorials/multi-boot/multi-boot-cl.rst b/source/clear-linux/tutorials/multi-boot/multi-boot-cl.rst deleted file mode 100644 index e65b69a7..00000000 --- a/source/clear-linux/tutorials/multi-boot/multi-boot-cl.rst +++ /dev/null @@ -1,172 +0,0 @@ -.. _multi-boot-cl: - -Install the Clear Linux OS -************************** - -#. Create a bootable USB drive of the |CL| installer using one of the methods - below. - - * :ref:`bootable-usb-linux` - * :ref:`bootable-usb-mac` - * :ref:`bootable-usb-windows` - -#. Start the |CL| installer and follow the prompts. - -#. On the *Choose Installation Type* screen, choose *Manual (Advanced)*, - as shown in Figure 1. - - .. figure:: figures/multi-boot-01.png - - Figure 1: |CL| installer: Choose installation type screen - - .. note:: - If you are not familiar with text-based installation - interfaces, here are some navigation tips: - - * Use the :kbd:`Up Arrow` and :kbd:`Down Arrow` keys to move between - the options on the screen. - - * Use the :kbd:`Space` to select or highlight an option. - - * Press :kbd:`Enter` to activate the selected option and to move ahead. - -#. On the :guilabel:`Choose partitioning method` screen, choose - :guilabel:`Manually configure mounts and partitions`, as shown in - Figure 2. - - .. figure:: figures/multi-boot-02.png - - Figure 2: |CL|: Choose partitioning method - -#. Select the drive, in this case :file:`/dev/sda` and press :kbd:`Enter` to - go into the `cgdisk` partitioning tool. See Figure 3. - - .. figure:: figures/multi-boot-03.png - - Figure 3: |CL|: Choose drive to partition - -#. Create a new root partition. - - #. Select :guilabel:`New`. See Figure 4. - - .. _multi-boot-04: - - .. figure:: figures/multi-boot-04.png - - Figure 4: |CL|: Create new partition - - #. Accept the default first sector. - - #. Specify the desired size of the partition. For this example, we - specified *50GB*. See Figure 5. - - .. figure:: figures/multi-boot-05.png - - Figure 5: |CL|: New partition size - - #. Set the partition type to :guilabel:`8300 (Linux filesystem)`. See - Figure 6. - - .. figure:: figures/multi-boot-06.png - - Figure 6: |CL|: Set partition type - - #. Name the partition :file:`CL-root`. This name makes it easier to - identify later. See Figure 7. - - .. figure:: figures/multi-boot-07.png - - Figure 7: |CL|: Name partition - -#. Create a new swap partition. See Figure 8. - - .. figure:: figures/multi-boot-08.png - - Figure 8: |CL|: Create swap partition - - #. Select the `free space` partition located at the bottom of the column. - - #. Select :guilabel:`New`. See :ref:`Figure 4`. - - #. Accept the default first sector. - - #. Specify the desired size of the swap partition. For this example, we - used 8GB. See the `recommended swap partition sizes`_ for guidance. - - #. Set the partition type to :guilabel:`8200 (Linux swap)`. - - #. Name the partition :file:`CL-swap`. - -#. Create a new EFI partition. See Figure 9. - - .. figure:: figures/multi-boot-09.png - - Figure 9: |CL|: Create EFI partition - - #. In the Partition Type column, select :guilabel:`free space` located at - the bottom of the column. - - #. Select :guilabel:`New`. See :ref:`Figure 4`. - - #. Accept the default first sector. - - #. Specify the desired size of the partition. For this example, we used - 1024 MB. This partition will hold |CL|, the kernels of the other - operating systems, and their boot information. Its size depends on the - number of installed operating systems. In general, allocate about 100MB - per operating system. For this example, we used 1024 MB. - - #. Set the partition type to :guilabel:`ef00 (EFI partition)`. - - #. Name the partition :file:`CL-EFI`. - -#. Select :guilabel:`Write` to apply the new partition table. - -#. Select :guilabel:`Quit` to exit the `cgdisk` tool. - -#. On the :guilabel:`Set mount points` screen, specify the mount points and - format settings as shown in Figure 10. - - .. figure:: figures/multi-boot-10.png - - Figure 10: |CL|: Set mount points - -#. On the :guilabel:`User configuration` screen, select - :guilabel:`Create an administrative user`. See Figure 11. - - .. figure:: figures/multi-boot-11.png - - Figure 11: |CL|: User configuration - -#. Select :guilabel:`Add user to sudoers?`. See Figure 12. - - .. figure:: figures/multi-boot-12.png - - Figure 12: |CL|: Add user as sudoer - -#. Follow the remaining prompts to complete the installation and go through - the out-of-box-experience of |CL|. - -#. Log in. - -#. Get root privileges. - - .. code-block:: console - - $ sudo -s - -#. Add a timeout period for Systemd-Boot to wait, otherwise it will not - present the boot menu and will always boot |CL|. - - .. code-block:: console - - # clr-boot-manager set-timeout 20 - - # clr-boot-manager update - -#. Reboot. - -If you want to install other OSes, refer to :ref:`multi-boot` for details. - -.. _recommended swap partition sizes: - https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/5/html/Deployment_Guide/ch-swapspace.html diff --git a/source/clear-linux/tutorials/multi-boot/multi-boot-mint.rst b/source/clear-linux/tutorials/multi-boot/multi-boot-mint.rst index e1076021..5f75d49a 100644 --- a/source/clear-linux/tutorials/multi-boot/multi-boot-mint.rst +++ b/source/clear-linux/tutorials/multi-boot/multi-boot-mint.rst @@ -133,7 +133,7 @@ Install Mint\* 18.1 “Serena” MATE .. note:: If an older version of Mint does not have the `bootctl` command, - skip this step and see :ref:`multi-boot-reset-bl` to restore the Clear + skip this step and see :ref:`multi-boot-restore-bl` to restore the Clear Linux Systemd-Boot boot loader. #. Reboot. diff --git a/source/clear-linux/tutorials/multi-boot/multi-boot-reset-bl.rst b/source/clear-linux/tutorials/multi-boot/multi-boot-restore-bl.rst similarity index 87% rename from source/clear-linux/tutorials/multi-boot/multi-boot-reset-bl.rst rename to source/clear-linux/tutorials/multi-boot/multi-boot-restore-bl.rst index 721200f9..36a8231c 100644 --- a/source/clear-linux/tutorials/multi-boot/multi-boot-reset-bl.rst +++ b/source/clear-linux/tutorials/multi-boot/multi-boot-restore-bl.rst @@ -1,6 +1,6 @@ -.. _multi-boot-reset-bl: +.. _multi-boot-restore-bl: -Recover the Clear Linux boot loader +Restore the Clear Linux boot loader *********************************** The installation of a new operating system or an upgrade of an existing @@ -12,7 +12,7 @@ longer the default boot loader. To restore it, follow the steps below. #. At the introduction screen, press :kbd:`Control+Alt+F2` to bring up the |CL| console. See Figure 1. - .. figure:: figures/multi-boot-reset-bl-1.png + .. figure:: figures/multi-boot-restore-bl-1.png Figure 1: |CL|: Console @@ -29,7 +29,7 @@ longer the default boot loader. To restore it, follow the steps below. # fdisk –l - .. figure:: figures/multi-boot-reset-bl-2.png + .. figure:: figures/multi-boot-restore-bl-2.png Figure 2: |CL| - fdisk -l diff --git a/source/clear-linux/tutorials/multi-boot/multi-boot-rhel.rst b/source/clear-linux/tutorials/multi-boot/multi-boot-rhel.rst index dafaa0c7..c830c44b 100644 --- a/source/clear-linux/tutorials/multi-boot/multi-boot-rhel.rst +++ b/source/clear-linux/tutorials/multi-boot/multi-boot-rhel.rst @@ -157,7 +157,7 @@ Install Red Hat\* Enterprise Linux 7.4 Beta .. note:: This version of Red Hat does not support `bootctl install`. Perform - the steps in :ref:`multi-boot-reset-bl` instead. + the steps in :ref:`multi-boot-restore-bl` instead. #. Reboot. diff --git a/source/clear-linux/tutorials/multi-boot/multi-boot-sles.rst b/source/clear-linux/tutorials/multi-boot/multi-boot-sles.rst index ea76ab78..8d3328b6 100644 --- a/source/clear-linux/tutorials/multi-boot/multi-boot-sles.rst +++ b/source/clear-linux/tutorials/multi-boot/multi-boot-sles.rst @@ -116,7 +116,7 @@ Install SUSE\* Linux Enterprise 12 SP2 .. note:: If an older version of SUSE does not have the `bootctl` command, - skip this step and see :ref:`multi-boot-reset-bl` to restore the |CL| + skip this step and see :ref:`multi-boot-restore-bl` to restore the |CL| Systemd-Boot boot loader. #. Reboot. diff --git a/source/clear-linux/tutorials/multi-boot/multi-boot-ubuntu.rst b/source/clear-linux/tutorials/multi-boot/multi-boot-ubuntu.rst index 1018a03e..490922ae 100644 --- a/source/clear-linux/tutorials/multi-boot/multi-boot-ubuntu.rst +++ b/source/clear-linux/tutorials/multi-boot/multi-boot-ubuntu.rst @@ -135,7 +135,7 @@ Install Ubuntu\* 16.04 LTS Desktop .. note:: If an older version of Ubuntu does not have the `bootctl` command, - skip this step and see :ref:`multi-boot-reset-bl` to restore the |CL| + skip this step and see :ref:`multi-boot-restore-bl` to restore the |CL| Systemd-Boot boot loader. #. Reboot. diff --git a/source/clear-linux/tutorials/multi-boot/multi-boot-win.rst b/source/clear-linux/tutorials/multi-boot/multi-boot-win.rst index 2ca6d17f..ea26a397 100644 --- a/source/clear-linux/tutorials/multi-boot/multi-boot-win.rst +++ b/source/clear-linux/tutorials/multi-boot/multi-boot-win.rst @@ -34,7 +34,7 @@ Install Windows\* Server 2016 #. Go through the Windows out-of-box-experience process. #. At this point, the ability to boot |CL| is lost because Windows is the - default boot loader. See :ref:`multi-boot-reset-bl` to restore the |CL| + default boot loader. See :ref:`multi-boot-restore-bl` to restore the |CL| Systemd-Boot boot loader and add Windows to its boot menu. diff --git a/source/clear-linux/tutorials/multi-boot/multi-boot.rst b/source/clear-linux/tutorials/multi-boot/multi-boot.rst index 2f06346c..1c707160 100644 --- a/source/clear-linux/tutorials/multi-boot/multi-boot.rst +++ b/source/clear-linux/tutorials/multi-boot/multi-boot.rst @@ -38,19 +38,6 @@ multi-booting computer is as follows: This process is not guaranteed to work with all Linux distributions and all their versions. -Detailed procedures -******************* - -.. toctree:: - :maxdepth: 2 - - multi-boot-cl - multi-boot-win - multi-boot-rhel - multi-boot-sles - multi-boot-ubuntu - multi-boot-mint - multi-boot-reset-bl Tested operating systems ************************ @@ -85,15 +72,200 @@ installation of the tested operating systems. .. note:: Updating any installed operating systems will likely result in the |CL| Systemd-Boot no longer being the default - boot loader. To restore it, see :ref:`multi-boot-reset-bl`. + boot loader. To restore it, see :ref:`multi-boot-restore-bl`. .. note:: Updating any Linux installation may result in changes of their kernels or initrds. Keep their corresponding Systemd-Boot :file:`/boot/efi/loader/entries/*.conf` files up-to-update. +.. _multi-boot-detail-proc: + +Detailed procedures +******************* + + :ref:`multi-boot-cl` (below) + +.. toctree:: + :maxdepth: 2 + + multi-boot-win + multi-boot-rhel + multi-boot-sles + multi-boot-ubuntu + multi-boot-mint + multi-boot-restore-bl + + +.. _multi-boot-cl: + +Install the Clear Linux OS +************************** + +#. Create a bootable USB drive of the |CL| installer using one of the methods + below. + + * :ref:`bootable-usb-linux` + * :ref:`bootable-usb-mac` + * :ref:`bootable-usb-windows` + +#. Start the |CL| installer and follow the prompts. + +#. On the *Choose Installation Type* screen, choose *Manual (Advanced)*, + as shown in Figure 1. + + .. figure:: figures/multi-boot-01.png + + Figure 1: |CL| installer: Choose installation type screen + + .. note:: + If you are not familiar with text-based installation + interfaces, here are some navigation tips: + + * Use the :kbd:`Up Arrow` and :kbd:`Down Arrow` keys to move between + the options on the screen. + + * Use the :kbd:`Space` to select or highlight an option. + + * Press :kbd:`Enter` to activate the selected option and to move ahead. + +#. On the :guilabel:`Choose partitioning method` screen, choose + :guilabel:`Manually configure mounts and partitions`, as shown in + Figure 2. + + .. figure:: figures/multi-boot-02.png + + Figure 2: |CL|: Choose partitioning method + +#. Select the drive, in this case :file:`/dev/sda` and press :kbd:`Enter` to + go into the `cgdisk` partitioning tool. See Figure 3. + + .. figure:: figures/multi-boot-03.png + + Figure 3: |CL|: Choose drive to partition + +#. Create a new root partition. + + #. Select :guilabel:`New`. See Figure 4. + + .. _multi-boot-04: + + .. figure:: figures/multi-boot-04.png + + Figure 4: |CL|: Create new partition + + #. Accept the default first sector. + + #. Specify the desired size of the partition. For this example, we + specified *50GB*. See Figure 5. + + .. figure:: figures/multi-boot-05.png + + Figure 5: |CL|: New partition size + + #. Set the partition type to :guilabel:`8300 (Linux filesystem)`. See + Figure 6. + + .. figure:: figures/multi-boot-06.png + + Figure 6: |CL|: Set partition type + + #. Name the partition :file:`CL-root`. This name makes it easier to + identify later. See Figure 7. + + .. figure:: figures/multi-boot-07.png + + Figure 7: |CL|: Name partition + +#. Create a new swap partition. See Figure 8. + + .. figure:: figures/multi-boot-08.png + + Figure 8: |CL|: Create swap partition + + #. Select the `free space` partition located at the bottom of the column. + + #. Select :guilabel:`New`. See :ref:`Figure 4`. + + #. Accept the default first sector. + + #. Specify the desired size of the swap partition. For this example, we + used 8GB. See the `recommended swap partition sizes`_ for guidance. + + #. Set the partition type to :guilabel:`8200 (Linux swap)`. + + #. Name the partition :file:`CL-swap`. + +#. Create a new EFI partition. See Figure 9. + + .. figure:: figures/multi-boot-09.png + + Figure 9: |CL|: Create EFI partition + + #. In the Partition Type column, select :guilabel:`free space` located at + the bottom of the column. + + #. Select :guilabel:`New`. See :ref:`Figure 4`. + + #. Accept the default first sector. + + #. Specify the desired size of the partition. For this example, we used + 1024 MB. This partition will hold |CL|, the kernels of the other + operating systems, and their boot information. Its size depends on the + number of installed operating systems. In general, allocate about 100MB + per operating system. For this example, we used 1024 MB. + + #. Set the partition type to :guilabel:`ef00 (EFI partition)`. + + #. Name the partition :file:`CL-EFI`. + +#. Select :guilabel:`Write` to apply the new partition table. + +#. Select :guilabel:`Quit` to exit the `cgdisk` tool. + +#. On the :guilabel:`Set mount points` screen, specify the mount points and + format settings as shown in Figure 10. + + .. figure:: figures/multi-boot-10.png + + Figure 10: |CL|: Set mount points + +#. On the :guilabel:`User configuration` screen, select + :guilabel:`Create an administrative user`. See Figure 11. + + .. figure:: figures/multi-boot-11.png + + Figure 11: |CL|: User configuration + +#. Select :guilabel:`Add user to sudoers?`. See Figure 12. + + .. figure:: figures/multi-boot-12.png + + Figure 12: |CL|: Add user as sudoer + +#. Follow the remaining prompts to complete the installation and go through + the out-of-box-experience of |CL|. + +#. Log in. + +#. Get root privileges. + + .. code-block:: console + + $ sudo -s + +#. Add a timeout period for Systemd-Boot to wait, otherwise it will not + present the boot menu and will always boot |CL|. + + .. code-block:: console + + # clr-boot-manager set-timeout 20 + + # clr-boot-manager update + +#. Reboot. + +If you want to install other OSes, refer to :ref:`multi-boot-detail-proc`. .. _recommended swap partition sizes: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/5/html/Deployment_Guide/ch-swapspace.html - -