commit 9013188ae7aead20965073e07dcbe5dffbfeb89a Author: Pete Travis immanetize@fedoraproject.org Date: Sun Sep 7 12:44:34 2014 -0600
removing whitespace before <screen> content
en-US/Network_based_Installations.xml | 112 ++++++++++++++++----------------- 1 files changed, 54 insertions(+), 58 deletions(-) --- diff --git a/en-US/Network_based_Installations.xml b/en-US/Network_based_Installations.xml index e6a2092..da789f0 100644 --- a/en-US/Network_based_Installations.xml +++ b/en-US/Network_based_Installations.xml @@ -81,16 +81,16 @@ Create a simple configuration for the dhcp server at <filename>/etc/dhcp/dhcpd.conf</filename> </para> <screen> - subnet 192.168.1.0 netmask 255.255.255.0 { - authoritative; - default-lease-time 600; - max-lease-time 7200; - ddns-update-style none; +subnet 192.168.1.0 netmask 255.255.255.0 { + authoritative; + default-lease-time 600; + max-lease-time 7200; + ddns-update-style none;
- option domain-name-servers 192.168.1.1; - option routers 192.168.1.1; + option domain-name-servers 192.168.1.1; + option routers 192.168.1.1;
- } + } </screen> </step> <step> @@ -98,8 +98,8 @@ Test your configuration and address any problems you discover. </para> <screen> - <command>systemctl start dhcpd</command> - <command>journalctl --unit dhcpd --since -2m --follow</command> +<command>systemctl start dhcpd</command> +<command>journalctl --unit dhcpd --since -2m --follow</command> </screen> </step> <step> @@ -107,16 +107,16 @@ 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> - subnet 192.168.1.0 netmask 255.255.255.0 { - if option arch = 00:07 { - filename "uefi/shim.efi"; - } else { - filename "pxelinux/pxelinux.0"; - } +subnet 192.168.1.0 netmask 255.255.255.0 { + if option arch = 00:07 { + filename "uefi/shim.efi"; + } else { + filename "pxelinux/pxelinux.0"; + }
- next-server 192.168.1.2; + next-server 192.168.1.2;
- ... + ... </screen> </step> <step> @@ -124,8 +124,8 @@ Restart the dhcp service to check the configuration and make changes as needed. </para> <screen> - <command>systemctl restart dhcpd</command> - <command>journalctl --unit dhcpd --since -2m --follow</command> +<command>systemctl restart dhcpd</command> +<command>journalctl --unit dhcpd --since -2m --follow</command> </screen> </step> </procedure> @@ -139,7 +139,7 @@ Install the tftp server package. </para> <screen> - <command>yum install tftp-server</command> +<command>yum install tftp-server</command> </screen> </step> <step> @@ -147,8 +147,8 @@ Start and enable the <systemitem class="resource">tftp socket</systemitem>. <systemitem class="daemon">systemd</systemitem> will automatically start the <systemitem class="daemon">tftpd</systemitem> service when required. </para> <screen> - <command>systemctl start tftp.socket</command> - <command>systemctl enable tftp.socket</command> +<command>systemctl start tftp.socket</command> +<command>systemctl enable tftp.socket</command> </screen> </step> </procedure> @@ -167,7 +167,7 @@ Install the <package>syslinux</package> package. </para> <screen> - <command>yum install syslinux</command> +<command>yum install syslinux</command> </screen> </step> <step> @@ -175,8 +175,8 @@ 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</filename></command> +<command>cp <filename>/usr/share/syslinux/{pxelinux.0,vesamenu.c32}</filename> <filename class="directory">/var/lib/tftpboot/pxelinux/</filename></command> </screen> </step> </substeps> @@ -189,7 +189,7 @@ Install the <package>shim</package> and <package>grub2-efi</package> packages. If your server is a BIOS system, you <emphasis>must install the packages to a temporary install root</emphasis>. Installing them directly on a BIOS machine will attempt to configure the system for UEFI booting and cause problems. </para> <screen> - <command>yum install shim grub2-efi --installroot=/tmp/fedora --releasever &PRODVER;</command> +<command>yum install shim grub2-efi --installroot=/tmp/fedora --releasever &PRODVER;</command> </screen> </step> <step> @@ -197,8 +197,8 @@ Create a directory for the bootloader files, and make them available there. </para> <screen> - <command>mkdir -p <filename class="directory" >/var/lib/tftpboot/uefi</filename></command> - <command>cp <filename>/tmp/fedora/boot/efi/EFI/fedora/{shim.efi,grubx64.efi}</filename> <filename>/var/lib/tftpboot/uefi/</filename></command> +<command>mkdir -p <filename class="directory" >/var/lib/tftpboot/uefi</filename></command> +<command>cp <filename>/tmp/fedora/boot/efi/EFI/fedora/{shim.efi,grubx64.efi}</filename> <filename>/var/lib/tftpboot/uefi/</filename></command> </screen> </step> </substeps> @@ -243,32 +243,32 @@ label local Create a boot menu for UEFI clients at <filename>/var/lib/tftpboot/pxelinux/uefi</filename>. </para> <programlisting> - function load_video { - insmod efi_gop - insmod efi_uga - insmod video_bochs - insmod video_cirrus - insmod all_video - } +function load_video { + insmod efi_gop + insmod efi_uga + insmod video_bochs + insmod video_cirrus + insmod all_video + }
- load_video - set gfxpayload=keep - insmod gzio +load_video +set gfxpayload=keep +insmod gzio
- menuentry 'Install &PRODUCT; 64-bit' --class fedora --class gnu-linux --class gnu --class os { - linuxefi f&PRODVER;/vmlinuz ip=dhcp inst.repo=inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Ev... - initrdefi f&PRODVER;/initrd.img - } +menuentry 'Install &PRODUCT; 64-bit' --class fedora --class gnu-linux --class gnu --class os { + linuxefi f&PRODVER;/vmlinuz ip=dhcp inst.repo=inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Ev... + initrdefi f&PRODVER;/initrd.img + }
- menuentry 'Install Fedora &PRODVER; Server' --class fedora --class gnu-linux --class gnu --class os { - kernel f&PRODVER;/vmlinuz - append initrd=f&PRODVER;/initrd.img ip=dhcp ks=https://git.fedorahosted.org/cgit/spin-kickstarts.git/plain/fedora-install-s... - } +menuentry 'Install Fedora &PRODVER; Server' --class fedora --class gnu-linux --class gnu --class os { + kernel f&PRODVER;/vmlinuz + append initrd=f&PRODVER;/initrd.img ip=dhcp ks=https://git.fedorahosted.org/cgit/spin-kickstarts.git/plain/fedora-install-s... + }
- menuentry 'Rescue installed system' --class fedora --class gnu-linux --class gnu --class os { - kernel f&PRODVER;/vmlinuz - append f&PRODVER;/initrd=initrd.img rescue root=live:http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fe... rescue - } +menuentry 'Rescue installed system' --class fedora --class gnu-linux --class gnu --class os { + kernel f&PRODVER;/vmlinuz + append f&PRODVER;/initrd=initrd.img rescue root=live:http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fe... rescue + } </programlisting> </step> </procedure> @@ -282,23 +282,19 @@ label local Create a directory for the files. </para> <screen> - <command>mkdir -p <filename class="directory" >/var/lib/tftpboot/f&PRODVER;</filename></command> +<command>mkdir -p <filename class="directory" >/var/lib/tftpboot/f&PRODVER;</filename></command> </screen> </step> <step> <para>Download the kernel.</para> <screen> - <command> - wget http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fe... -o <filename>/var/lib/tftpboot/f&PRODVER;/vmlinuz</filename> - </command> +<command>wget http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fe... -o <filename>/var/lib/tftpboot/f&PRODVER;/vmlinuz</filename></command> </screen> </step> <step> <para>Download the initrd</para> <screen> - <command> - wget http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fe... -o <filename>/var/lib/tftpboot/f&PRODVER;/initrd.img</filename> - </command> +<command>wget http://download.fedoraproject.org/pub/fedora/linux/releases/&PRODVER;/Fe... -o <filename>/var/lib/tftpboot/f&PRODVER;/initrd.img</filename></command> </screen> </step> </procedure>
docs-commits@lists.fedoraproject.org