[install-guide/f21-branch] Adding a missing ostreesetup command to Kickstart
by pbokoc
commit cca840223ba4034ed9f22f3cabf3380b0095eeb7
Author: Petr Bokoc <pbokoc(a)redhat.com>
Date: Tue Jan 27 17:48:37 2015 +0100
Adding a missing ostreesetup command to Kickstart
en-US/Kickstart_Syntax_Reference.xml | 48 +++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 3 deletions(-)
---
diff --git a/en-US/Kickstart_Syntax_Reference.xml b/en-US/Kickstart_Syntax_Reference.xml
index 2e07479..266d47a 100644
--- a/en-US/Kickstart_Syntax_Reference.xml
+++ b/en-US/Kickstart_Syntax_Reference.xml
@@ -325,11 +325,53 @@
</para>
</section>
- <section id="sect-kickstart-commands-ostree">
- <title>ostree - Install from an OSTree</title>
+ <section id="sect-kickstart-commands-ostreesetup">
+ <title>ostreesetup (optional) - Install from an OSTree</title>
<para>
- text
+ Used for OSTree installations. See <ulink url="https://wiki.gnome.org/action/show/Projects/OSTree" /> for more information about OSTree. Available options are:
</para>
+ <variablelist>
+ <varlistentry>
+ <term><option>--osname=</option></term>
+ <listitem>
+ <para>
+ Management root for OS installation (required).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--remote=</option></term>
+ <listitem>
+ <para>
+ Management root for OS installation (optional).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--url=</option></term>
+ <listitem>
+ <para>
+ Repository URL (required).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--ref=</option></term>
+ <listitem>
+ <para>
+ Name of branch inside the repository (required).
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--nogpgcheck</option></term>
+ <listitem>
+ <para>
+ Disable GPG key verification (optional).
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</section>
<section id="sect-kickstart-commands-repo">
9 years, 3 months
[install-guide/f22-branch] PXE Improvements
by pbokoc
commit 9ba26d9192e4b5e7448c5c0c375165f0471599d5
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Sun Jan 11 15:06:54 2015 -0700
PXE Improvements
- Client view of tftp supplied files is a path relative to dhcp declared
'filename', in this case, pxelinux.0. Corrected paths, with a mental
note to add an admonition about it for the adventurous.
- dhcpd doesn't accept 'arch' as a predefined option, so we have to
associate it with an option code and define it. This probably works -
or at least, dhcpd will run this way.
- Did not touch EFI/PXE stuff, no viable test process is currently
available here. Probably needs work.
en-US/Network_based_Installations.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/en-US/Network_based_Installations.xml b/en-US/Network_based_Installations.xml
index bc9e68c..91ba3e3 100644
--- a/en-US/Network_based_Installations.xml
+++ b/en-US/Network_based_Installations.xml
@@ -106,11 +106,14 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
Add entries to point clients to their bootloader and the server that provides it to your subnet configuration in <filename>/etc/dhcp/dhcpd.conf</filename>. Because DHCP clients provide the server with identifying information along with their address request, BIOS clients and UEFI clients can each be directed to the correct bootloader.
</para>
<screen>
+# refer to RFC4758 for possible arch option values
+option arch code 93 = unsigned integer 16;
+
subnet 192.168.1.0 netmask 255.255.255.0 {
if option arch = 00:07 {
filename "uefi/shim.efi";
} else {
- filename "pxelinux/pxelinux.0";
+ filename "pxelinux.0";
}
next-server 192.168.1.2;
@@ -174,8 +177,8 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
Create a directory for the bootloader files, and make them available there.
</para>
<screen>
-<command>mkdir -p <filename class="directory">/var/lib/tftpboot/pxelinux</filename></command>
-<command>cp <filename>/usr/share/syslinux/{pxelinux.0,vesamenu.c32}</filename> <filename class="directory">/var/lib/tftpboot/pxelinux/</filename></command>
+<command>mkdir -p <filename class="directory">/var/lib/tftpboot/pxelinux.cfg</filename></command>
+<command>cp <filename>/usr/share/syslinux/{pxelinux.0,vesamenu.c32,ldlinux.c32,libcom32.c32,libutil.c32}</filename> <filename class="directory">/var/lib/tftpboot/</filename></command>
</screen>
</step>
</substeps>
@@ -207,9 +210,8 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
<procedure>
<title>Configuring client bootloaders</title>
<step>
- <para>Create a boot menu for BIOS clients at <filename>/var/lib/tftpboot/pxelinux/default</filename>.</para>
+ <para>Create a boot menu for BIOS clients at <filename>/var/lib/tftpboot/pxelinux.cfg/default</filename>.</para>
<remark>needs adminition about kickstarts here somewhere, and testing of pulling .ks out of cgit</remark>
- <remark>Need to check if the product media ships different or incompatible initramfsen</remark>
<programlisting>
default vesamenu.c32
prompt 1
9 years, 3 months
[multiboot-guide] master: Use correct DOCTYPE in headers (275b62b)
by Pete Travis
Repository : http://git.fedorahosted.org/cgit/docs/multiboot-guide.git
On branch : master
>---------------------------------------------------------------
commit 275b62baa5494ec079c809f65d61a327eca26989
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Mon Jan 26 16:43:24 2015 -0700
Use correct DOCTYPE in headers
Copypasta can be easy to make, but xmllint has more refined tastes.
Also restructured a little to correct a markup error.
>---------------------------------------------------------------
en-US/BIOS-general.xml | 2 +-
en-US/BIOS.xml | 2 +-
en-US/BOOT-BIOS_or_UEFI.xml | 2 +-
en-US/BOOT-general.xml | 2 +-
en-US/FAQ.xml | 2 +-
en-US/Free_Space.xml | 4 ++--
en-US/GRUB-basics.xml | 2 +-
en-US/GRUB-configuration.xml | 2 +-
en-US/GRUB-customizing.xml | 2 +-
en-US/GRUB-reinstalling.xml | 16 ++++++----------
en-US/GRUB-runtime.xml | 2 +-
en-US/GRUB.xml | 2 +-
en-US/Introduction.xml | 3 +--
en-US/TODO.xml | 2 +-
en-US/UEFI-apple.xml | 2 +-
en-US/UEFI-general.xml | 2 +-
en-US/UEFI-win.xml | 2 +-
en-US/UEFI.xml | 2 +-
en-US/boot_arguments.xml | 2 +-
en-US/fast_reboot_admonition.xml | 2 +-
20 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/en-US/BIOS-general.xml b/en-US/BIOS-general.xml
index 7be8122..0d5c15c 100644
--- a/en-US/BIOS-general.xml
+++ b/en-US/BIOS-general.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/BIOS.xml b/en-US/BIOS.xml
index ec8454d..8d3cd70 100644
--- a/en-US/BIOS.xml
+++ b/en-US/BIOS.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/BOOT-BIOS_or_UEFI.xml b/en-US/BOOT-BIOS_or_UEFI.xml
index 33d9f19..e022d3a 100644
--- a/en-US/BOOT-BIOS_or_UEFI.xml
+++ b/en-US/BOOT-BIOS_or_UEFI.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/BOOT-general.xml b/en-US/BOOT-general.xml
index c4833a9..23dedab 100644
--- a/en-US/BOOT-general.xml
+++ b/en-US/BOOT-general.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/FAQ.xml b/en-US/FAQ.xml
index 40c0e78..4cada45 100644
--- a/en-US/FAQ.xml
+++ b/en-US/FAQ.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/Free_Space.xml b/en-US/Free_Space.xml
index 1da78c0..babc641 100644
--- a/en-US/Free_Space.xml
+++ b/en-US/Free_Space.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
@@ -8,7 +8,7 @@
<title>Making Room for Fedora</title>
<para>
Fedora requires a volume of <emphasis>unallocated</emphasis> storage space for installation. To make room for Fedora, both the existing filesystem and the partition it resides on must be resized.
- </para>
+ </para>
<warning>
<title>Be cautious when resizing!</title>
<para>
diff --git a/en-US/GRUB-basics.xml b/en-US/GRUB-basics.xml
index 6ce6df2..1d8c611 100644
--- a/en-US/GRUB-basics.xml
+++ b/en-US/GRUB-basics.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/GRUB-configuration.xml b/en-US/GRUB-configuration.xml
index 3cb9e17..7649b6f 100644
--- a/en-US/GRUB-configuration.xml
+++ b/en-US/GRUB-configuration.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/GRUB-customizing.xml b/en-US/GRUB-customizing.xml
index 481c790..06bc3ef 100644
--- a/en-US/GRUB-customizing.xml
+++ b/en-US/GRUB-customizing.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/GRUB-reinstalling.xml b/en-US/GRUB-reinstalling.xml
index 2096c83..0745bc4 100644
--- a/en-US/GRUB-reinstalling.xml
+++ b/en-US/GRUB-reinstalling.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
@@ -9,6 +9,7 @@
<title>Recreating GRUB</title>
<para>
This section describes the process for reinstalling the GRUB bootloader and recreating the configuration. Unlike legacy GRUB, which required users to manually create entries, GRUB2 will scan the system for bootable systems and automatically create the menu configuration. There are a number of reasons to reinstall GRUB:
+ </para>
<simplelist>
<member>
The boot menu does not include an available operating systems.
@@ -20,11 +21,10 @@
You have chosen not to use <application>anaconda</application> to install grub.
</member>
</simplelist>
- </para>
<section id="GRUB-mkconfig">
<title>Refreshing GRUB configuration</title>
<para>
- To recreate the GRUB configuration from a booted system, use the <command>grub2-mkconfig</command> utility. The program will scan your system and create menu entries for what it finds. You should also use <command>grub2-mkconfig</command> after customizing menu entries, a process described in <xref linkend="GRUB-configuration" />
+ To recreate the GRUB configuration from a booted system, use the <command>grub2-mkconfig</command> utility. The program will scan your system and create menu entries for what it finds. You should also use <command>grub2-mkconfig</command> after customizing menu entries, a process described in <xref linkend="GRUB-configuration" /> If Fedora does not boot because of an invalid GRUB configuration, you can perform this procedure to repair it after following the instructions in <xref linkend="common-chroot_from_live" />.
</para>
<para>
Refresh GRUB configuration on a BIOS system:
@@ -41,9 +41,6 @@
<para>
In most cases, this operation will detect any operating system available on your computer and create entries for them in the GRUB menu. Actually reinstalling the GRUB bootloader isn't required, just reconfiguring.
</para>
- <para>
- If Fedora does not boot because of an invalid GRUB configuration, you can perform the procedure above from a <xref linkend="common-chroot_from_live">chroot</xref> to repair it.
- </para>
</section>
<section id="GRUB-reinstalling">
<title>Reinstalling GRUB</title>
@@ -55,6 +52,7 @@
</para>
<section id="GRUB-reinstalling-UEFI">
<title>Reinstalling GRUB on UEFI systems.</title>
+ <para />
<procedure>
<title>Reinstalling GRUB on UEFI systems.</title>
<step>
@@ -122,13 +120,11 @@
</step>
</procedure>
</section>
-
-
- <para />
- </section>
<section id="GRUB-reinstalling-BIOS">
<title>Reinstalling GRUB on BIOS systems.</title>
<para />
</section>
+ </section>
</section>
+
<!-- see TODO.xml for some additional information you may choose to add -->
diff --git a/en-US/GRUB-runtime.xml b/en-US/GRUB-runtime.xml
index 68c6546..35602ba 100644
--- a/en-US/GRUB-runtime.xml
+++ b/en-US/GRUB-runtime.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/GRUB.xml b/en-US/GRUB.xml
index 101e357..0e78652 100644
--- a/en-US/GRUB.xml
+++ b/en-US/GRUB.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/Introduction.xml b/en-US/Introduction.xml
index 93191e7..e7cdcd3 100644
--- a/en-US/Introduction.xml
+++ b/en-US/Introduction.xml
@@ -1,8 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
-
]>
<section id="multiboot-introduction">
<title>Introduction</title>
diff --git a/en-US/TODO.xml b/en-US/TODO.xml
index 78fdb30..6cbdbf3 100644
--- a/en-US/TODO.xml
+++ b/en-US/TODO.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
[
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/UEFI-apple.xml b/en-US/UEFI-apple.xml
index cc1751a..8dc3561 100644
--- a/en-US/UEFI-apple.xml
+++ b/en-US/UEFI-apple.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/UEFI-general.xml b/en-US/UEFI-general.xml
index 1067a86..efcf271 100644
--- a/en-US/UEFI-general.xml
+++ b/en-US/UEFI-general.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/UEFI-win.xml b/en-US/UEFI-win.xml
index 3f62612..bec8137 100644
--- a/en-US/UEFI-win.xml
+++ b/en-US/UEFI-win.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/UEFI.xml b/en-US/UEFI.xml
index e359118..7864b9b 100644
--- a/en-US/UEFI.xml
+++ b/en-US/UEFI.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/boot_arguments.xml b/en-US/boot_arguments.xml
index 96b3bbe..c05af3b 100644
--- a/en-US/boot_arguments.xml
+++ b/en-US/boot_arguments.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
diff --git a/en-US/fast_reboot_admonition.xml b/en-US/fast_reboot_admonition.xml
index 5c803e3..0c5eb70 100644
--- a/en-US/fast_reboot_admonition.xml
+++ b/en-US/fast_reboot_admonition.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE caution PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
%BOOK_ENTITIES;
]>
9 years, 3 months
[multiboot-guide] master: Reinstalling GRUB on UEFI systems (0bf512f)
by Pete Travis
Repository : http://git.fedorahosted.org/cgit/docs/multiboot-guide.git
On branch : master
>---------------------------------------------------------------
commit 0bf512fd4bd2d22d393113a6ecb3c6489a85f0ad
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Mon Jan 26 15:44:05 2015 -0700
Reinstalling GRUB on UEFI systems
No GRUB? Trash your EFI system partition? Look here for salvation.
>---------------------------------------------------------------
en-US/GRUB-reinstalling.xml | 95 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 93 insertions(+), 2 deletions(-)
diff --git a/en-US/GRUB-reinstalling.xml b/en-US/GRUB-reinstalling.xml
index 57cb522..2096c83 100644
--- a/en-US/GRUB-reinstalling.xml
+++ b/en-US/GRUB-reinstalling.xml
@@ -5,8 +5,8 @@
]>
-<section id="GRUB-reinstalling">
- <title>Reinstalling GRUB</title>
+<section id="GRUB-recreating">
+ <title>Recreating GRUB</title>
<para>
This section describes the process for reinstalling the GRUB bootloader and recreating the configuration. Unlike legacy GRUB, which required users to manually create entries, GRUB2 will scan the system for bootable systems and automatically create the menu configuration. There are a number of reasons to reinstall GRUB:
<simplelist>
@@ -38,6 +38,97 @@
<prompt>#</prompt><command>grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg</command>
</screen>
</para>
+ <para>
+ In most cases, this operation will detect any operating system available on your computer and create entries for them in the GRUB menu. Actually reinstalling the GRUB bootloader isn't required, just reconfiguring.
+ </para>
+ <para>
+ If Fedora does not boot because of an invalid GRUB configuration, you can perform the procedure above from a <xref linkend="common-chroot_from_live">chroot</xref> to repair it.
+ </para>
</section>
+ <section id="GRUB-reinstalling">
+ <title>Reinstalling GRUB</title>
+ <para>
+ In some cases, you may need to reinstall the GRUB bootloader itself. It might be because another operating system has overwritten GRUB, or because of some inadvertent action. This section explains how to do that, but if you do have a GRUB menu or GRUB prompt, you probably don't need to perform the operations. This section assumes that you have tried all of the firmware boot options, and are sure you do not have a functioning GRUB bootloader on your system.
+ </para>
+ <para>
+ Be careful not to mix up the different instructions for UEFI and legacy systems. Installing the wrong implementation of GRUB can cause problems that are difficult to resolve.
+ </para>
+ <section id="GRUB-reinstalling-UEFI">
+ <title>Reinstalling GRUB on UEFI systems.</title>
+ <procedure>
+ <title>Reinstalling GRUB on UEFI systems.</title>
+ <step>
+ <para>
+ Enter your installed system in a chroot using the instructions in <xref linkend="common-chroot_from_live" />. Be sure to boot the live image in UEFI mode.
+ </para>
+ </step>
+ <step>
+ <para>
+ Reinstall the packages that provide bootloader files. This will recreate any Fedora files missing from the EFI system partition.
+ </para>
+ <screen>
+<prompt>#</prompt> <command>yum reinstall grub2-efi shim</command>
+ </screen>
+ </step>
+ <step>
+ <para>
+ Optionally, recreate the firmware boot entry. You only need to do this if the Fedora entry is missing, so check to see if the Fedora entry is present before continuing.
+ </para>
+ <substeps>
+ <step>
+ <para>
+ Check the existing firmware boot entries.
+ </para>
+ <screen>
+<prompt>#</prompt> <command>efibootmgr -v</command>
+<computeroutput>
+ BootCurrent: 0015
+ Timeout: 1 seconds
+ BootOrder: 0015,0000
+ Boot0000* Windows Boot Manager HD(3,2e9a5000,32000,0d13443c-6bf1-4952-960c-c05ba2b3fd8c)File(\EFI\Microsoft\Boot\bootmgfw.efi)WINDOWS.........x...B.C.D.O.B.J.E.C.T.=.{.9.d.e.a.8.6.2.c.-.5.c.d.d.-.4.e.7.0.-.a.c.c.1.-.f.3.2.b.3.4.4.d.4.7.9.5.}...a...............
+ Boot0015* Fedora HD(1,800,64000,211be689-9d4f-4034-bbc9-4e03372165db)File(\EFI\fedora\grubx64.efi)
+ Boot0018* SATA : PORT 4 : HL-DT-ST BD-RE WH14NS40 BIOS(3,0,00)AMBO
+ Boot0019* SATA : PORT 6G 0 : ST31500341AS : PART 0 : Boot Drive BIOS(2,0,00)AMBO
+</computeroutput>
+ </screen>
+ </step>
+ <step>
+ <para>
+ If the Fedora entry is missing, check the installation logs to get the command to put it back.
+ </para>
+ <screen>
+<prompt>#</prompt> <command>grep efibootmgr /var/log/anaconda/anaconda.program.log</command>
+<computeroutput>
+05:43:07,548 INFO program: Running... efibootmgr
+05:43:07,566 INFO program: Running... efibootmgr -c -w -L Fedora -d /dev/sda -p 2 -l \EFI\fedora\shim.efi
+</computeroutput>
+ </screen>
+ </step>
+ <step>
+ <para>
+ Run the <command>efibootmgr</command> invocation again. If needed, adjust the arguments to fit your EFI system partition's location. In this example, <option>-d /dev/sda</option> places that partition on the <filename class="partition" >/dev/sda</filename>, and <option>-p 2</option> designates the second partition on the drive.
+ </para>
+ <screen>
+<prompt>#</prompt> <command>efibootmgr -c -w -L Fedora -d /dev/sda -p 2 -l \EFI\fedora\shim.efi</command>
+ </screen>
+ </step>
+ </substeps>
+ </step>
+ <step>
+ <para>
+ Exit the chroot and reboot your system into Fedora.
+ <!-- TODO: link to EFI boot order help from here -->
+ </para>
+ </step>
+ </procedure>
+ </section>
+
+
+ <para />
+ </section>
+ <section id="GRUB-reinstalling-BIOS">
+ <title>Reinstalling GRUB on BIOS systems.</title>
+ <para />
+ </section>
</section>
<!-- see TODO.xml for some additional information you may choose to add -->
9 years, 3 months
[multiboot-guide] master: How to chroot (5108b73)
by Pete Travis
Repository : http://git.fedorahosted.org/cgit/docs/multiboot-guide.git
On branch : master
>---------------------------------------------------------------
commit 5108b73ac438f280e6350ff4f357919dbaebe638
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Mon Jan 26 14:45:20 2015 -0700
How to chroot
If GRUB is trashed, or a Fedora installation gets damaged, setting up a
chroot from a live image can be an invaluable tool. The rather lengthy
procedure makes it a large derivation from the content, however. Rather
than make it overly simple, I'll put it in an appendix for now and refer
to it as needed.
>---------------------------------------------------------------
en-US/Common_Operations.xml | 172 ++++++++++++++++++++++++++++++++++++++
en-US/Fedora_Multiboot_Guide.xml | 1 +
2 files changed, 173 insertions(+), 0 deletions(-)
diff --git a/en-US/Common_Operations.xml b/en-US/Common_Operations.xml
new file mode 100644
index 0000000..c7be032
--- /dev/null
+++ b/en-US/Common_Operations.xml
@@ -0,0 +1,172 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Multiboot_Guide.ent">
+ %BOOK_ENTITIES;
+ ]>
+
+ <appendix id="common_operations_appendix">
+ <title>Common Operations</title>
+ <para>
+ This section includes common operations you might have to perform when following various instructions in this guide.
+ </para>
+ <section id="common-chroot_from_live">
+ <title>Setting up a chroot from a live image</title>
+ <para>
+ To operate on a Fedora installation that will not boot, you must use a <literal>chroot</literal>. The process initially uses a Fedora live image, but sets up an environment that uses the files, executables, and libraries from the installed system.
+ </para>
+ <para>
+ The Fedora Netinstall image has a system recovery option that will set up the chroot for a Fedora system automatically. Use the instructions here for a live image.
+ </para>
+ <para>
+ Be consistent about your booting methods. If you have Fedora installed Fedora in UEFI mode, boot the live image in the same way.
+ </para>
+ <procedure>
+ <title>Creating chroot of a Fedora installation</title>
+ <step>
+ <para>
+ Boot a Fedora live image and open a root terminal window.
+ </para>
+ </step>
+ <step>
+ <para>
+ Create a directory to work in.
+ </para>
+ <screen>
+<prompt>#</prompt> <command>mkdir /mnt/sysimage</command>
+ </screen>
+ </step>
+ <step>
+ <para>
+ List the available partitions. We'll use this list to identify all the partitions your Fedora installation needs.
+ </para>
+ <screen>
+ <prompt>#</prompt> <command>blkid</command>
+ <computeroutput>
+/dev/sda1: LABEL="WINRE_DRV" UUID="C812A5BC12A5AFBC" TYPE="ntfs" PARTLABEL="Basic data partition" PARTUUID="3f4f9bb5-6551-4411-9cea-d06dd1d10aff"
+/dev/sda2: LABEL="SYSTEM_DRV" UUID="32A7-BBCC" TYPE="vfat" PARTLABEL="EFI System Partition" PARTUUID="f540b7b9-782a-48d2-89b4-4f0a720121cf"
+/dev/sda3: LABEL="LRS_ESP" UUID="F2C1-30B7" TYPE="vfat" PARTLABEL="Basic data partition" PARTUUID="cdbadfc7-e84b-4fe0-935c-28419b0082f7"
+/dev/sda4: PARTLABEL="Microsoft reserved partition" PARTUUID="bb3d61f2-652b-4793-a8e9-8b42e819f6bb"
+/dev/sda5: LABEL="Windows8_OS" UUID="7898C3F398C3ADC6" TYPE="ntfs" PARTLABEL="Basic data partition" PARTUUID="111e1bb0-dafd-439b-8af3-9d6b86bff9e9"
+/dev/sda6: LABEL="LENOVO" UUID="16E2DDF6E2DDD9D7" TYPE="ntfs" PARTLABEL="Basic data partition" PARTUUID="45dc466a-929d-4862-91ed-396afe2e4f59"
+/dev/sda7: LABEL="PBR_DRV" UUID="40A4E1E7A4E1E000" TYPE="ntfs" PARTLABEL="Basic data partition" PARTUUID="29b2cac6-ff56-4cf2-b62e-d04230a72294"
+/dev/sda8: UUID="5958dcb4-dfeb-4f6c-ba07-8b2ada8b1602" TYPE="ext4" PARTUUID="cacf80f0-3376-443d-bfb5-5d3fe689885e"
+/dev/sda9: UUID="PRueOy-TXAC-mKDV-NRLC-k4gt-C63H-D0zfYd" TYPE="LVM2_member" PARTUUID="555251b9-438f-4f16-9011-754620526ebe"
+/dev/mapper/fedora-swap: UUID="28d71a2c-1b34-4115-aa19-083373ec4d8a" TYPE="swap"
+/dev/mapper/fedora-root: UUID="125425e2-dd7b-46e9-8c64-6d2c5b192c76" TYPE="ext4"
+/dev/mapper/fedora-home: UUID="1cec1d42-8750-4746-bd36-145c1ebb2d89" TYPE="ext4"
+ </computeroutput>
+ </screen>
+ </step>
+ <step>
+ <para>
+ Identify Fedora's root partition.
+ </para>
+ <screen>
+<prompt>#</prompt> <command>mount /dev/sda8 /mnt/sysimage</command>
+<prompt>#</prompt> <command>cat /mnt/sysimage/etc/fedora-release</command>
+<computeroutput>
+ cat: /mnt/sysimage/etc/fedora-release: No such file or directory
+</computeroutput>
+<prompt>#</prompt> <command>ls /mnt/sysimage</command>
+<computeroutput>
+ config-3.17.7-300.fc21.x86_64
+ config-3.17.8-300.fc21.x86_64
+ config-3.19.0-0.rc5.git2.1.fc22.x86_64
+ efi
+ elf-memtest86+-5.01
+ extlinux
+ grub2
+ initramfs-0-rescue-39995d7d26a74b1784e7bd9a7bfefdf1.img
+ initramfs-3.17.7-300.fc21.x86_64.img
+ initramfs-3.17.8-300.fc21.x86_64.img
+ initramfs-3.19.0-0.rc5.git2.1.fc22.x86_64.img
+ initrd-plymouth.img
+ lost+found
+ memtest86+-5.01
+ System.map-3.17.7-300.fc21.x86_64
+ System.map-3.17.8-300.fc21.x86_64
+ System.map-3.19.0-0.rc5.git2.1.fc22.x86_64
+ vmlinuz-0-rescue-39995d7d26a74b1784e7bd9a7bfefdf1
+ vmlinuz-3.17.7-300.fc21.x86_64
+ vmlinuz-3.17.8-300.fc21.x86_64
+ vmlinuz-3.19.0-0.rc5.git2.1.fc22.x86_64
+</computeroutput>
+<prompt>#</prompt> <command>umount /dev/sda8</command>
+ </screen>
+ <para>
+ <filename class="partition" >/dev/sda8</filename> wasn't the root partition, since it did not contain the <filename>/etc/fedora-release</filename> file, but we did find other things inside. The <filename>vmlinuz</filename> and <filename>initramfs</filename> files are the kernels and initramfs, and they always live on <filename class="partition">/boot</filename>. Remember that for later.
+ </para>
+ <screen>
+<prompt>#</prompt> <command>mount /dev/mapper/fedora-root /mnt/sysimage</command>
+<prompt>#</prompt> <command>cat /mnt/sysimage/etc/fedora-release</command>
+<computeroutput>Fedora release 21 (Twenty One)</computeroutput>
+ </screen>
+ <para>
+ That's the Fedora root partition, so we will leave it mounted there. Because the other filesystems use mount points inside the root partition, we mount it first.
+ </para>
+ </step>
+ <step>
+ <para>
+ Next, identify and mount the <filename class="directory">/boot</filename> partition. We found it as <filename class="partition" >/dev/sda8</filename> already, but we can confirm by checking Fedora's <filename>/etc/fstab</filename>, the file that tells the system where to mount filesystems.
+ </para>
+ <screen>
+<prompt>#</prompt> <command> grep boot /etc/fstab</command>
+<computeroutput>
+ UUID=5958dcb4-dfeb-4f6c-ba07-8b2ada8b1602 /boot ext4 defaults 1 2
+ UUID=32A7-BBCC /boot/efi vfat umask=0077,shortname=winnt 0 0
+</computeroutput>
+ </screen>
+ <para>
+ <filename>/etc/fstab</filename> uses <literal>Universally Unique Identifiers</literal> to identify partitions. This makes sure that the right partitions get mounted in the right place, even if drive orders change. The UUID listed for <filename class="directory">/boot</filename> matches what <command>blkid</command> reports for <filename class="partition">/dev/sda8</filename>, so we know we have the right partition.
+ </para>
+ <screen>
+<prompt>#</prompt> <command>mount /dev/sda8 /mnt/sysimage/boot</command>
+ </screen>
+ </step>
+ <step>
+ <para>
+ If this is a UEFI installation, mount the EFI system partition next. In this example, we found it in the previous step, and can match the UUID with <command>blkid</command> output. You can confirm by looking at the contents once mounted.
+ </para>
+ <screen>
+<prompt>#</prompt> <command>mount /dev/sda2 /mnt/sysimage/boot/efi</command>
+<prompt>#</prompt> <command>ls /mnt/sysimage/boot/efi</command>
+<computeroutput>
+ /boot/efi/BOOTSECT.BAK
+
+ /boot/efi/EFI:
+ BOOT fedora Microsoft
+</computeroutput>
+ </screen>
+ </step>
+ <step>
+ <para>
+ Next mount the virtual filesystems that the system uses to communicate with processes and devices. These are always the same, so we can do it in one command.
+ </para>
+ <screen>
+<prompt>#</prompt><command>for dir in /dev /proc /sys; do mount --bind $dir /mnt/sysimage/$dir ; done</command>
+ </screen>
+ </step>
+ <step>
+ <para>
+ Enter the chroot to continue, and begin working on your Fedora installation.
+ </para>
+ <screen>
+<prompt>#</prompt> <command>chroot /mnt/sysimage</command>
+ </screen>
+ </step>
+ <step>
+ <para>
+ When you are finished, use the <command>exit</command> command to leave the chroot.
+ </para>
+ </step>
+ </procedure>
+ </section>
+
+
+
+
+
+
+
+ </appendix>
+
diff --git a/en-US/Fedora_Multiboot_Guide.xml b/en-US/Fedora_Multiboot_Guide.xml
index 7ec1547..d3a4ef4 100644
--- a/en-US/Fedora_Multiboot_Guide.xml
+++ b/en-US/Fedora_Multiboot_Guide.xml
@@ -14,6 +14,7 @@
<xi:include href="BIOS.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="UEFI.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="boot_arguments.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Common_Operations.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<index />
</article>
9 years, 3 months