[multiboot-guide] master: cleaning up some markup. (7f7a198)
immanetize at fedoraproject.org
immanetize at fedoraproject.org
Tue Jan 6 03:39:06 UTC 2015
Repository : http://git.fedorahosted.org/cgit/docs/multiboot-guide.git
On branch : master
>---------------------------------------------------------------
commit 7f7a1985f7aeb330715698fb8ccf3f3e4290202f
Author: Pete Travis <immanetize at fedoraproject.org>
Date: Tue Sep 30 18:57:05 2014 -0600
cleaning up some markup.
Notably, when using <!-- comments , the parser looks for the next double hypen to close the comment. If it finds a line of them
----------------------------------------------
the parser quits and gives up.
>---------------------------------------------------------------
en-US/GRUB-configuration.xml | 4 ++--
en-US/TODO.xml | 17 +++++++----------
en-US/UEFI-win.xml | 10 +++++++---
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/en-US/GRUB-configuration.xml b/en-US/GRUB-configuration.xml
index 6f576fa..d141456 100644
--- a/en-US/GRUB-configuration.xml
+++ b/en-US/GRUB-configuration.xml
@@ -116,7 +116,7 @@
</section>
<!--
---------------------------------------------------------------------------------------------
+
A proper Windows GRUB entry:
Place inside the 'custom' section...
@@ -128,5 +128,5 @@ menuentry 'Windows Boot Manager' {
chainloader /EFI/Microsoft/Boot/bootmgfw.efi
boot
}
---------------------------------------------------------------------------------------------
+
-->
diff --git a/en-US/TODO.xml b/en-US/TODO.xml
index 19b6657..1eba09d 100644
--- a/en-US/TODO.xml
+++ b/en-US/TODO.xml
@@ -10,7 +10,6 @@
<!--
File reference, example information for further use in explaining other aspects of multibooting; like repairing an installation...
- ----------------------------
Using df -H:
root at localhost /: df -H
@@ -24,7 +23,7 @@ tmpfs 4.2G 58k 4.2G 1% /tmp
/dev/sda8 500M 104M 366M 23% /boot
/dev/sda7 210M 10M 200M 5% /boot/efi
/dev/mapper/fedora-home 162G 26G 128G 17% /home
---------------------------------
+
Using parted print:
root at localhost /: parted /dev/sda print
@@ -43,8 +42,8 @@ Number Start End Size File system Name Flags
8 753GB 754GB 524MB ext4
9 754GB 989GB 235GB
6 989GB 1000GB 10.8GB ntfs Microsoft recovery partition hidden, diag
---------------------------------
-Using blkid:
+
+ Using blkid:
root at localhost /: blkid
/dev/sda1: LABEL="ESP" UUID="6481-E0BE" TYPE="vfat" PARTLABEL="EFI System Partition" PARTUUID="dfb7601a-7aab-4cd5-9469-50ea6d52c429"
@@ -60,7 +59,7 @@ root at localhost /: blkid
/dev/mapper/fedora-root: UUID="6302bae0-5a18-4fdb-84da-a83bf512ad82" TYPE="ext4"
/dev/mapper/fedora-swap: UUID="7a4fabaf-3385-40c3-822f-b3ba3d33caaf" TYPE="swap"
/dev/mapper/fedora-home: UUID="96872f18-6312-43ea-a177-447fdbee98df" TYPE="ext4"
-------------------------------------------
+
Looking at fstab entries;
Modifying fstab:
@@ -80,7 +79,7 @@ UUID=E085-2C94 /boot/efi vfat umask=0077,shortname=win
~
~
"/etc/fstab" 13L, 688C
-------------------------------------------
+
Looking at crypttab;
Modifying crypttab:
@@ -91,7 +90,7 @@ luks-c32b5719-857f-48fb-a782-6086dd05d008 UUID=c32b5719-857f-48fb-a782-6086dd05d
~
"/etc/crypttab" 1L, 90C
-------------------------------------------
+
Copying the Fedoara-created ESP files to the Microsoft-created ESP (for whatever reason)
# cd /mnt
@@ -109,15 +108,13 @@ Verify the copy...
# cd /
# umount /mnt/msftesp
# rm -r -f /mnt/msftesp
-----------------------------------------
+
Make an EFI entry:
# efibootmgr -c -d /dev/sda -p 1 -l \\EFI\\fedora\\shim.efi -L Fedora
-----------------------------------------------------------------------------------------
Booting Removable Media in EFI:
Removable devices are enumerated *usually* after the BootOrder list has been exhausted without a boot. However, removable device enumeration will take place before you are presented with the EFI Boot Manager menu when you hold down the correct key (while powering on) to enter the EFI firmware screen. You will notice a short delay in getting into the EFI Settings page whenever you press the 'magic' key during power on. That is because the removable device enumeration process is occurring and adding entries for any/all removable media that may be inserted. Once the enumeration process has completed, the EFI will halt the boot process and you are presented with the EFI Boot Manager Menu from which you can make your selection.
---------------------------------------------------------------------
-->
diff --git a/en-US/UEFI-win.xml b/en-US/UEFI-win.xml
index cf3bc02..8197152 100644
--- a/en-US/UEFI-win.xml
+++ b/en-US/UEFI-win.xml
@@ -14,7 +14,6 @@
</para><para>
We hope that you will find this information both interesting and helpful. With the information outlined in this guide, you will have a better understanding of what is happening 'behind the scenes'. That should prove useful when it comes time to work your way through troubleshooting a particular issue related to booting using UEFI. This guide represents our best effort at explaining a very technical and difficult to understand specification in terms that everyone can understand. For this reason, some parts of the explanation have been over-simplified for ease in understanding the overall concept or process that is taking place. For those that desire more information that what is available in this article, extensive information about UEFI is available here <ulink url="http://www.uefidk.com/learn" /> and here <ulink url="http://www.uefi.org/" />
</para>
-</section>
<section id="Boot_Manager_vs_BootLoader">
<title>Boot Managers and Boot Loaders Defined</title>
<para>
@@ -91,7 +90,8 @@
</para>
<para>
GRUB2, on the other hand, takes advantage of two additional processes to boot: Default Boot Behavior (which includes the fallback process as outlined below) and a GRUB command prompt.
- </para>
+</para>
+</section>
<section id="If_You_Must">
<title>Using BCD to dual boot</title>
<para>
@@ -154,7 +154,8 @@
</para><para>
It is the <filename>fallback.efi</filename> application that enumerates the various <filename>boot.csv</filename> files that it finds, creates and appends the EFI NVRAM entries, and finally, passes control back to the EFI Boot Manager to boot the first entry it created; which, as mentioned earlier, it does by changing the BootNext variable.
</para><para>
- The Default Boot Behavior, which initiates fallback, happens in the event that any of the following conditions are met:
+ The Default Boot Behavior, which initiates fallback, happens in the event that any of the following conditions are met:
+</para>
<orderedlist>
<listitem>
<para>
@@ -231,6 +232,7 @@
When you enter the "EFI Settings" of your computer and look at the menu, all of that enumeration is complete before the menu is displayed. All you then have to do is select which device you wish to boot from and hit Enter.
</para>
</section>
+
<!-- comment
Refs:
@@ -253,3 +255,5 @@ https://www.youtube.com/watch?v=35D0_feZnK8
http://superuser.com/questions/376470/how-to-reinstall-grub2-efi
https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html-single/System_Administrators_Guide/index.html#ch-Working_with_the_GRUB_2_Boot_Loader
https://en.wikipedia.org/wiki/GNU_GRUB#GRUB_version_2 -->
+
+</section>
More information about the docs-commits
mailing list