From 2735dbda5a640f103df55a1d958cf7406c6e05d8 Mon Sep 17 00:00:00 2001 From: Zach Ploskey Date: Sep 15 2017 19:17:13 +0000 Subject: [PATCH 1/4] Attempt to clean up unnecessary line breaks in commands Signed-off-by: Zach Ploskey --- diff --git a/en-US/advanced/Kickstart_Installations.adoc b/en-US/advanced/Kickstart_Installations.adoc index e6f1ff9..60d5acb 100644 --- a/en-US/advanced/Kickstart_Installations.adoc +++ b/en-US/advanced/Kickstart_Installations.adoc @@ -61,14 +61,14 @@ When creating or customizing your kickstart file, it is useful to verify that it [subs="macros"] ---- -pass:quotes[`#`] dnf install pykickstart +# dnf install pykickstart ---- After installing the package, you can validate a Kickstart file using the following command: [subs="quotes, macros"] ---- -`$` [command]#ksvalidator _/path/to/kickstart.ks_pass:attributes[{blank}]# +$ [command]#ksvalidator _/path/to/kickstart.ks_# ---- Replace _/path/to/kickstart.ks_ with the path to the Kickstart file you want to verify. diff --git a/en-US/advanced/Network_based_Installations.adoc b/en-US/advanced/Network_based_Installations.adoc index 2c1e4ff..6ad1fb4 100644 --- a/en-US/advanced/Network_based_Installations.adoc +++ b/en-US/advanced/Network_based_Installations.adoc @@ -47,14 +47,13 @@ A Fedora repository must be available for the installation. The example in this + [subs="macros"] ---- -pass:quotes[`#`] dnf install dhcp +# dnf install dhcp ---- . Create a simple configuration for the dhcp server at `/etc/dhcp/dhcpd.conf` + [subs="quotes"] ---- - subnet 192.168.1.0 netmask 255.255.255.0 { authoritative; default-lease-time 600; @@ -65,7 +64,6 @@ option domain-name-servers 192.168.1.1; option routers 192.168.1.1; } - ---- . Test your configuration and address any problems you discover. @@ -75,13 +73,11 @@ option routers 192.168.1.1; [command]#systemctl start dhcpd# [command]#journalctl --unit dhcpd --since -2m --follow# - ---- . Add entries to point clients to their bootloader and the server that provides it to your subnet configuration in `/etc/dhcp/dhcpd.conf`. 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. + ---- - # refer to RFC4758 for possible arch option values option arch code 93 = unsigned integer 16; @@ -95,7 +91,6 @@ filename "pxelinux.0"; next-server 192.168.1.2; ... - ---- . Restart the dhcp service to check the configuration and make changes as needed. @@ -122,10 +117,8 @@ next-server 192.168.1.2; + [subs="quotes, macros"] ---- - -[command]#systemctl start tftp.socket# -[command]#systemctl enable tftp.socket# - +# [command]#systemctl start tftp.socket# +# [command]#systemctl enable tftp.socket# ---- [[pxe-bootloader]] @@ -144,10 +137,8 @@ next-server 192.168.1.2; + [subs="quotes, macros"] ---- - -[command]#mkdir -p `/var/lib/tftpboot/pxelinux.cfg`pass:attributes[{blank}]# -[command]#cp `/usr/share/syslinux/{pxelinux.0,vesamenu.c32,ldlinux.c32,libcom32.c32,libutil.c32}` `/var/lib/tftpboot/`pass:attributes[{blank}]# - +# [command]#mkdir -p `/var/lib/tftpboot/pxelinux.cfg`pass:attributes[{blank}]# +# [command]#cp `/usr/share/syslinux/{pxelinux.0,vesamenu.c32,ldlinux.c32,libcom32.c32,libutil.c32}` `/var/lib/tftpboot/`pass:attributes[{blank}]# ---- . Get the bootloader files for UEFI systems @@ -163,10 +154,8 @@ next-server 192.168.1.2; + [subs="quotes, macros"] ---- - -[command]#mkdir -p `/var/lib/tftpboot/uefi`pass:attributes[{blank}]# -[command]#cp `/tmp/fedora/boot/efi/EFI/fedora/{shim.efi,grubx64.efi}` `/var/lib/tftpboot/uefi/`pass:attributes[{blank}]# - +# [command]#mkdir -p `/var/lib/tftpboot/uefi`pass:attributes[{blank}]# +# [command]#cp `/tmp/fedora/boot/efi/EFI/fedora/{shim.efi,grubx64.efi}` `/var/lib/tftpboot/uefi/`pass:attributes[{blank}]# ---- .Configuring client bootloaders @@ -176,7 +165,6 @@ next-server 192.168.1.2; + [subs="attributes"] ---- - default vesamenu.c32 prompt 1 timeout 600 @@ -201,20 +189,18 @@ append initrd=f{PRODVER}initrd.img ip=dhcp root=live:http://download.fedoraproje label local menu label Boot from ^local drive localboot 0xffff - ---- . Create a boot menu for UEFI clients at `/var/lib/tftpboot/pxelinux/uefi`. + [subs="attributes"] ---- - function load_video { -insmod efi_gop -insmod efi_uga -insmod video_bochs -insmod video_cirrus -insmod all_video + insmod efi_gop + insmod efi_uga + insmod video_bochs + insmod video_cirrus + insmod all_video } load_video @@ -222,20 +208,19 @@ 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=http://download.fedoraproject.org/pub/fedora/linux/releases/{PRODVER}/Server/x86_64/os/ -initrdefi f{PRODVER}/initrd.img + linuxefi f{PRODVER}/vmlinuz ip=dhcp inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/{PRODVER}/Server/x86_64/os/ + 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 inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/{PRODVER}/Server/x86_64/os/ ip=dhcp ks=https://git.fedorahosted.org/cgit/spin-kickstarts.git/plain/fedora-install-server.ks?h=f21 + kernel f{PRODVER}/vmlinuz + append initrd=f{PRODVER}/initrd.img inst.repo=http://download.fedoraproject.org/pub/fedora/linux/releases/{PRODVER}/Server/x86_64/os/ ip=dhcp ks=https://git.fedorahosted.org/cgit/spin-kickstarts.git/plain/fedora-install-server.ks?h=f21 } menuentry 'Rescue installed system' --class fedora --class gnu-linux --class gnu --class os { -kernel f{PRODVER}/vmlinuz -append f{PRODVER}/initrd=initrd.img root=live:http://download.fedoraproject.org/pub/fedora/linux/releases/{PRODVER}/Server/x86_64/os/LiveOS/squashfs.img rescue + kernel f{PRODVER}/vmlinuz + append f{PRODVER}/initrd=initrd.img root=live:http://download.fedoraproject.org/pub/fedora/linux/releases/{PRODVER}/Server/x86_64/os/LiveOS/squashfs.img rescue } - ---- [[pxe-kernel]] @@ -246,21 +231,21 @@ append f{PRODVER}/initrd=initrd.img root=live:http://download.fedoraproject.org/ + [subs="quotes, macros, attributes"] ---- -[command]#mkdir -p `/var/lib/tftpboot/f{PRODVER}`pass:attributes[{blank}]# +# [command]#mkdir -p `/var/lib/tftpboot/f{PRODVER}`pass:attributes[{blank}]# ---- . Download the kernel. + [subs="attributes"] ---- -wget http://download.fedoraproject.org/pub/fedora/linux/releases/{PRODVER}/Server/x86_64/os/images/pxeboot/vmlinuz -O /var/lib/tftpboot/f{PRODVER}/vmlinuz +# wget http://download.fedoraproject.org/pub/fedora/linux/releases/{PRODVER}/Server/x86_64/os/images/pxeboot/vmlinuz -O /var/lib/tftpboot/f{PRODVER}/vmlinuz ---- . Download the initrd + [subs="attributes"] ---- -wget http://download.fedoraproject.org/pub/fedora/linux/releases/{PRODVER}/Server/x86_64/os/images/pxeboot/initrd.img -O /var/lib/tftpboot/f{PRODVER}/initrd.img +# wget http://download.fedoraproject.org/pub/fedora/linux/releases/{PRODVER}/Server/x86_64/os/images/pxeboot/initrd.img -O /var/lib/tftpboot/f{PRODVER}/initrd.img ---- [[pxe-repositories]] diff --git a/en-US/advanced/VNC_Installations.adoc b/en-US/advanced/VNC_Installations.adoc index 5a64e24..7e9a431 100644 --- a/en-US/advanced/VNC_Installations.adoc +++ b/en-US/advanced/VNC_Installations.adoc @@ -118,7 +118,7 @@ VNC connect mode is when the system being installed initiates a connection to th + [subs="quotes, macros"] ---- -`$` [command]#vncviewer -listen _PORT_pass:attributes[{blank}]# +$ [command]#vncviewer -listen _PORT_# ---- + Replace _PORT_ with the port number you want to use for the connection. @@ -131,7 +131,6 @@ The terminal will display a message similar to the following example: [subs="quotes"] ---- - TigerVNC Viewer 64-bit v1.3.0 (20130924) Built on Sep 24 2013 at 16:32:56 Copyright (C) 1999-2011 TigerVNC Team and many others (see README.txt) @@ -139,7 +138,6 @@ See http://www.tigervnc.org for information on TigerVNC. Thu Feb 20 15:23:54 2014 main: Listening on port 5901 - ---- ==== @@ -150,7 +148,7 @@ When this message is displayed, the VNC viewer is ready and waiting for an incom + [subs="quotes, macros"] ---- -[option]#inst.vnc inst.vncconnect=pass:attributes[{blank}]_HOST_:pass:attributes[{blank}]_PORT_pass:attributes[{blank}]# +[option]#inst.vnc inst.vncconnect=pass:attributes[{blank}]_HOST_:pass:attributes[{blank}]_PORT_# ---- + Replace _HOST_ with the IP address of the system running the listening VNC viewer, and _PORT_ with the port number that the VNC viewer is listening on. diff --git a/en-US/appendixes/Kickstart_Syntax_Reference.adoc b/en-US/appendixes/Kickstart_Syntax_Reference.adoc index 4797975..7a0df60 100644 --- a/en-US/appendixes/Kickstart_Syntax_Reference.adoc +++ b/en-US/appendixes/Kickstart_Syntax_Reference.adoc @@ -34,7 +34,7 @@ While the general principles of Kickstart installations tend to stay the same, t [subs="quotes, macros, attributes"] ---- -`$` [command]#ksverdiff -f F{PREVVER} -t F{PRODVER}# +$ [command]#ksverdiff -f F{PREVVER} -t F{PRODVER}# ---- The [option]#-f# option specifies the release to start the comparison with, and the [option]#-t# option to specify the release to end with. For additional information, see the `ksverdiff(1)` man page. Also note that you can not use this to display changes in a release that is newer than your system - the version of [package]*pykickstart* on Fedora{nbsp}{PREVVER} can not display changes in Fedora{nbsp}{PRODVER}. @@ -1644,7 +1644,7 @@ Sets the system's root password to the _password_ argument. + [subs="quotes, macros"] ---- -`$` [command]#python -c 'import crypt; print(crypt.crypt("My Password", "$6$My Salt"))'# +$ [command]#python -c 'import crypt; print(crypt.crypt("My Password", "$6$My Salt"))'# ---- + This will generate a SHA512 crypt of your password using your provided salt. @@ -1708,7 +1708,7 @@ Creates a new user on the system. + [subs="quotes, macros"] ---- -`$` [command]#python -c 'import crypt; print(crypt.crypt("My Password", "$6$My Salt"))'# +$ [command]#python -c 'import crypt; print(crypt.crypt("My Password", "$6$My Salt"))'# ---- + This will generate a SHA512 crypt of your password using your provided salt. @@ -1827,7 +1827,7 @@ If you want to disable root `ssh` access to your hardware during installation, u + [subs="quotes, macros"] ---- -`$` [command]#python -c 'import crypt; print(crypt.crypt("My Password", "$6$My Salt"))'# +$ [command]#python -c 'import crypt; print(crypt.crypt("My Password", "$6$My Salt"))'# ---- + This will generate a SHA512 crypt of your password using your provided salt. @@ -1901,10 +1901,8 @@ Available options are: [option]#--reserve-mb=#:: The amount of memory you want to reserve for [application]*Kdump* in megabytes. For example: + ---- - %addon com_redhat_kdump --enable --reserve-mb=128 %end - ---- + You can also specify `auto` instead of a numeric value. In that case the installer will determine the amount of RAM to reserve for kdump automatically, based on your system architecture and the total amount of memory on the system. diff --git a/en-US/install/InitialSetupHub.adoc b/en-US/install/InitialSetupHub.adoc index 149d189..bc96236 100644 --- a/en-US/install/InitialSetupHub.adoc +++ b/en-US/install/InitialSetupHub.adoc @@ -31,9 +31,7 @@ It is possible to configure [application]*Initial Setup* to display all availabl [subs="quotes, macros"] ---- - - pass:attributes[{blank}][command]#firstboot --enable --reconfig# - +# [command]firstboot --enable --reconfig# ---- The [option]#--reconfig# option specifies that all options should be displayed. See xref:../advanced/Kickstart_Installations.adoc#chap-kickstart-installations[Automating the Installation with Kickstart] for information about Kickstart installations. @@ -47,7 +45,7 @@ Normally, it is not possible to return to [application]*Initial Setup* after you [subs="macros"] ---- -pass:quotes[`#`] systemctl enable initial-setup-graphical.service +# systemctl enable initial-setup-graphical.service ---- Then, reboot your system. diff --git a/en-US/install/Preparing_for_Installation.adoc b/en-US/install/Preparing_for_Installation.adoc index a13e45b..db0d50c 100644 --- a/en-US/install/Preparing_for_Installation.adoc +++ b/en-US/install/Preparing_for_Installation.adoc @@ -52,8 +52,8 @@ By calculating the image's `checksum` on your own computer and comparing it to t [subs="macros"] ---- -pass:quotes[`>`] cd $HOME\Downloads\ -pass:quotes[`>`] ls +> cd $HOME\Downloads\ +> ls Directory: C:\Users\Pete\Downloads @@ -88,15 +88,13 @@ Mode LastWriteTime Length Name + [subs="macros"] ---- - -pass:quotes[`>`] echo "Download Checksum: $download_checksum" -pass:quotes[`>`] echo "Expected Checksum: $expected_checksum" -pass:quotes[`>`] if ( $download_checksum -eq "$expected_checksum" ) { +> echo "Download Checksum: $download_checksum" +> echo "Expected Checksum: $expected_checksum" +> if ( $download_checksum -eq "$expected_checksum" ) { echo "Checksum test passed!" } else { echo "Checksum test failed." } - ---- [[sect-verifying-nix]] @@ -109,7 +107,7 @@ echo "Checksum test failed." + [subs="quotes, macros, attributes"] ---- -`${nbsp}`pass:attributes[{blank}]pass:attributes[{blank}][command]#cd ~/Downloads# +$ [command]#cd ~/Downloads# ---- . Use the appropriate utility to verify the image checksum. @@ -118,14 +116,14 @@ echo "Checksum test failed." + [subs="macros, attributes"] ---- -pass:quotes,attributes[`${nbsp}`]sha256sum -c *CHECKSUM +$ sha256sum -c *CHECKSUM ---- + ** For OSX: + [subs="macros, attributes"] ---- -pass:quotes,attributes[`${nbsp}`]shasum -a 256 -c *CHECKSUM +$ shasum -a 256 -c *CHECKSUM ---- [[sect-preparing-boot-media]] @@ -202,14 +200,14 @@ image::fedora_media_writer/write_to_device.png[Image of Fedora Image Writer writ + [subs="quotes, macros, attributes"] ---- -`${nbsp}`pass:attributes[{blank}]pass:attributes[{blank}][command]#sudo dnf install liveusb-creator# +$ [command]#sudo dnf install liveusb-creator# ---- . You can call [application]*Fedora Media Writer* by issuing the command: + [subs="quotes, macros, attributes"] ---- -`${nbsp}`pass:attributes[{blank}]pass:attributes[{blank}][command]#sudo liveusb-creator# +$ [command]#sudo liveusb-creator# ---- + or in [application]*gnome 3* by selecting *activities,* then selecting *system tools*, and then selecting [application]*Fedora LiveUSB Creator* @@ -302,7 +300,7 @@ image::fedora_media_writer/write_to_device.png[Image of Fedora Image Writer writ [subs="quotes, macros, attributes"] ---- -`${nbsp}`pass:attributes[{blank}]pass:attributes[{blank}][command]#dmesg|tail# +$ [command]#dmesg|tail# [288954.686557] usb 2-1.8: New USB device strings: Mfr=0, Product=1, SerialNumber=2 [288954.686559] usb 2-1.8: Product: USB Storage [288954.686562] usb 2-1.8: SerialNumber: 000000009225 @@ -320,7 +318,7 @@ image::fedora_media_writer/write_to_device.png[Image of Fedora Image Writer writ + [subs="macros"] ---- -pass:quotes[`#`] dd if=/path/to/Fedora-Live-Security-x86_64-21.iso of=/dev/sdd +# dd if=/path/to/Fedora-Live-Security-x86_64-21.iso of=/dev/sdd ---- .Creating a Boot CD or DVD @@ -339,4 +337,4 @@ The exact steps you need to take to burn a bootable CD or DVD from an ISO image . When prompted, select the ISO image of {PRODUCT} to be burned, and the CD or DVD burner with a blank disc inside (if you have more than one drive). -. Confirm your selection, and wait for the disc to be burned. \ No newline at end of file +. Confirm your selection, and wait for the disc to be burned. diff --git a/en-US/install/Troubleshooting.adoc b/en-US/install/Troubleshooting.adoc index d651960..f48d352 100644 --- a/en-US/install/Troubleshooting.adoc +++ b/en-US/install/Troubleshooting.adoc @@ -74,40 +74,40 @@ Note the name of the connected device - in the above example, it is `sdb`. + [subs="macros"] ---- -pass:quotes[`#`] mkdir usb +# mkdir usb ---- . Mount the USB flash drive onto the newly created directory. Note that in most cases, you do not want to mount the whole drive, but a partition on it. Therefore, do not use the name `sdb` - use the name of the partition you want to write the log files to. In this example, the name `sdb1` is used. + [subs="macros"] ---- -pass:quotes[`#`] mount /dev/sdb1 /mnt/usb +# mount /dev/sdb1 /mnt/usb ---- + You can now verify that you mounted the correct device and partition by accessing it and listing its contents - the list should match what you expect to be on the drive. + [subs="macros"] ---- -pass:quotes[`#`] cd /mnt/usb +# cd /mnt/usb ---- + [subs="macros"] ---- -pass:quotes[`#`] ls +# ls ---- . Copy the log files to the mounted device. + [subs="macros"] ---- -pass:quotes[`#`] cp /tmp/*log /mnt/usb +# cp /tmp/*log /mnt/usb ---- . Unmount the USB flash drive. If you get an error message saying that the target is busy, change your working directory to outside the mount (for example, `/`). + [subs="macros"] ---- -pass:quotes[`#`] umount /mnt/usb +# umount /mnt/usb ---- The log files from the installation are now saved on the USB flash drive. @@ -121,21 +121,21 @@ The log files from the installation are now saved on the USB flash drive. + [subs="macros"] ---- -pass:quotes[`#`] cd /tmp +# cd /tmp ---- . Copy the log files onto another system on the network using the [command]#scp# command: + [subs="macros"] ---- -pass:quotes[`#`] scp *log user@address:path +# scp *log user@address:path ---- + Replace _user_ with a valid user name on the target system, _address_ with the target system's address or host name, and _path_ with the path to the directory you wish to save the log files into. For example, if you want to log in as `john` to a system with an IP address of `192.168.0.122` and place the log files into the `/home/john/logs/` directory on that system, the command will have the following form: + [subs="macros"] ---- -pass:quotes[`#`] scp *log john@192.168.0.122:/home/john/logs/ +# scp *log john@192.168.0.122:/home/john/logs/ ---- + When connecting to the target system for the first time, you may encounter a message similar to the following: @@ -232,21 +232,21 @@ pass:quotes[`sh-4.2#`] + [subs="macros"] ---- -pass:quotes[`sh-4.2#`] /usr/sbin/load_policy -i +sh-4.2# /usr/sbin/load_policy -i ---- . Execute the following command to remount your root partition: + [subs="macros"] ---- -pass:quotes[`sh4.2#`] mount -o remount,rw / +sh4.2# mount -o remount,rw / ---- . Reset the root password: + [subs="macros"] ---- -pass:quotes[`sh4.2#`] passwd root +sh4.2# passwd root ---- + When prompted to, enter your new root password and confirm by pressing the kbd:[Enter] key. Enter the password for the second time to make sure you typed it correctly and confirm with kbd:[Enter] again. If both passwords match, a message informing you of a successful root password change will appear. @@ -255,7 +255,7 @@ When prompted to, enter your new root password and confirm by pressing the kbd:[ + [subs="macros"] ---- -pass:quotes[`sh4.2#`] mount -o remount,ro / +sh4.2# mount -o remount,ro / ---- . Reboot the system. From now on, you will be able to log in as the root user using the new password set up during this procedure. @@ -290,7 +290,7 @@ If the system started successfully, you can log in normally. Then you will need + [subs="quotes, macros"] ---- -`$` [command]#su -# +$ [command]#su -# ---- . Open the `/etc/default/grub` configuration file using a plain text editor such as [application]*vim*. @@ -311,7 +311,7 @@ On this line, delete the `rhgb` option. + [subs="macros"] ---- -pass:quotes[`#`] grub2-mkconfig --output=/boot/grub2/grub.cfg +# grub2-mkconfig --output=/boot/grub2/grub.cfg ---- After you finish this procedure, you can reboot your computer. {PRODUCT} will not use the graphical boot sequence any more. If you wish to enable graphical boot, follow the same procedure, add the `rhgb` option to the `GRUB_CMDLINE_LINUX` line in the `/etc/default/grub` file and refresh the boot loader configuration again using the [command]#grub2-mkconfig# command. @@ -332,14 +332,14 @@ To set up your system so that you can log in at a graphical login screen, you mu + [subs="macros"] ---- -pass:quotes[`#`] systemctl set-default graphical.target +# systemctl set-default graphical.target ---- Graphical login is now enabled by default - you will be presented with a graphical login prompt after the next reboot. If you want to reverse this change and keep using the text-based login prompt, execute the following command as `root`: [subs="macros"] ---- -pass:quotes[`#`] systemctl set-default multi-user.target +# systemctl set-default multi-user.target ---- For more information about targets in [application]*systemd*, see the [citetitle]_{PRODUCT} System Administrator's Guide_, available at link:++http://docs.fedoraproject.org/++[]. @@ -357,7 +357,7 @@ If you are having trouble with the [application]*X* server crashing when a user [subs="quotes, macros"] ---- -`$` [command]#df -h# +$ [command]#df -h# ---- The output will help you diagnose which partition is full - in most cases, the problem will be on the `/home` partition. A sample output of the [command]#df# command may look similar to the following: @@ -427,7 +427,7 @@ Replace _xx_ with the amount of RAM you have in megabytes. + [subs="macros"] ---- -pass:quotes[`#`] grub2-mkconfig --output=/boot/grub2/grub.cfg +# grub2-mkconfig --output=/boot/grub2/grub.cfg ---- In `/etc/default/grub`, the above example would look similar to the following: @@ -444,4 +444,4 @@ GRUB_DISABLE_RECOVERY="true" ---- -See the [citetitle]_{PRODUCT} System Administrator's Guide_, available at link:++http://docs.fedoraproject.org/++[], for more information about working with the [application]*GRUB2* boot loader. \ No newline at end of file +See the [citetitle]_{PRODUCT} System Administrator's Guide_, available at link:++http://docs.fedoraproject.org/++[], for more information about working with the [application]*GRUB2* boot loader. From 40e893501729ae7b4bc4ada1b01a11b02189a904 Mon Sep 17 00:00:00 2001 From: Zach Ploskey Date: Sep 15 2017 19:55:38 +0000 Subject: [PATCH 2/4] Cleanup, clarify mediawriter/liveusb-creator change Signed-off-by: Zach Ploskey --- diff --git a/en-US/install/Preparing_for_Installation.adoc b/en-US/install/Preparing_for_Installation.adoc index db0d50c..accf811 100644 --- a/en-US/install/Preparing_for_Installation.adoc +++ b/en-US/install/Preparing_for_Installation.adoc @@ -18,9 +18,7 @@ Manual Reinstallation:: You can upgrade to the latest version of Fedora manuall [WARNING] ==== - Always back up your data before performing an upgrade or reinstalling your system, no matter which method you choose. - ==== [[sect-preparing-obtaining-images]] @@ -51,7 +49,6 @@ By calculating the image's `checksum` on your own computer and comparing it to t + [subs="macros"] ---- - > cd $HOME\Downloads\ > ls @@ -62,26 +59,21 @@ Mode LastWriteTime Length Name -a--- 11/25/2014 12:39 PM 272 Fedora-Server-21-x86_64-CHECKSUM -a--- 11/25/2014 12:39 PM 2047868928 Fedora-Server-DVD-x86_64-21.iso - ---- . Load the resources required to calculate the checksum. + ---- - > $image = "Fedora-Server-DVD-x86_64-21.iso" > $checksum_file = "Fedora-Server-21-x86_64-CHECKSUM" > $sha256 = New-Object -TypeName System.Security.Cryptography.sha256CryptoServiceProvider > $expected_checksum = ((Get-Content $checksum_file | Select-String -Pattern $image) -split " ")[0].ToLower() - ---- . Calculate the downloaded image's checksum. This will take a while! + ---- - > $download_checksum = [System.BitConverter]::ToString($sha256.ComputeHash([System.IO.File]::ReadAllBytes("$PWD\$image"))).ToLower() -replace '-', '' - ---- . Compare the calculated checksum to the expected checksum. @@ -147,11 +139,10 @@ These methods circumvent the boot-loader configuration built into Fedora images, Utilities that use a direct write method, and do not modify the Fedora image, will produce the most consistently successful results. -==== - -.Be sure you choose the right device! [WARNING] ==== +Be sure you choose the right device! +==== Most media creation methods in this section are destructive. Ensure you do not need any data on the USB stick, and double check you have chosen the correct device before continuing. @@ -169,7 +160,7 @@ Most media creation methods in this section are destructive. Ensure you do not n [[figu-fedora_media_writer_choose_flavor_windows]] .Fedora Media Writer Main Screen: Choose your Edition of Fedora + -image::fedora_media_writer/main_screen.png[Image of Fedora Image Writer Main Screen] +image::fedora_media_writer/main_screen.png[Image of Fedora Media Writer Main Screen] . If you choose one of the beginning default Fedora editions, such as Fedora workstation or server. [application]*Fedora Media Writer* will give you information and details about it before you proceed with the download and USB creation. For Fedora Workstation, you can choose a different architecture, such as 32bit if you select "other architectures". Otherwise select "Create Live USB" to proceed. @@ -177,14 +168,14 @@ before you proceed with the download and USB creation. For Fedora Workstation, y [[figu-fedora_media_writer_distro_information_windows]] .Fedora Media Writer Distro Information + -image::fedora_media_writer/distro_information.png[Image of Fedora Image Writer Distro Information Screen] +image::fedora_media_writer/distro_information.png[Image of Fedora Media Writer Distro Information Screen] . Fedora Media Writer will automatically download the ISO for you, but if you all-ready have it in your Downloads directory it will be immediately available to use. + [[figu-fedora_media_writer_Automatic_download_windows]] .Fedora Media Writer Automatic Download + -image::fedora_media_writer/automatic_download.png[Image of Fedora Image Writer Automatic Download] +image::fedora_media_writer/automatic_download.png[Image of Fedora Media Writer Automatic Download] . After the download completes, or when [application]*Fedora Media Writer* is ready. Plug in a USB drive you wish to use as a bootable media. @@ -193,31 +184,37 @@ image::fedora_media_writer/automatic_download.png[Image of Fedora Image Writer A [[figu-fedora_media_writer_write_to_device_windows]] .Fedora Media Writer Write to USB Device + -image::fedora_media_writer/write_to_device.png[Image of Fedora Image Writer write to device red button] +image::fedora_media_writer/write_to_device.png[Image of Fedora Media Writer write to device red button] -.Creating USB Media with Fedora Media Writer on Fedora 24 and later -. On Fedora 24 or later, you can download Fedora Image Writer with the command: +.Creating USB Media with Fedora Media Writer. +. On Fedora 25 or later, you can download Fedora Media Writer with the command: + [subs="quotes, macros, attributes"] ---- -$ [command]#sudo dnf install liveusb-creator# +$ [command]#sudo dnf install mediawriter# ---- - -. You can call [application]*Fedora Media Writer* by issuing the command: ++ +[TIP] +==== +In Fedora 24 and earlier this package and binary are named `liveusb-creator`, +so replace `mediawriter` with `liveusb-creator`. +==== ++ +. You can call [application]*Fedora Media Writer* by issuing the command: + [subs="quotes, macros, attributes"] ---- -$ [command]#sudo liveusb-creator# +$ [command]#sudo mediawriter# ---- + -or in [application]*gnome 3* by selecting *activities,* then selecting *system tools*, and then selecting [application]*Fedora LiveUSB Creator* - +or in [application]*Gnome 3* by selecting *activities,* then selecting *system tools*, and then selecting [application]*Fedora Media Writer*. ++ . Select the Fedora Edition you wish to make a bootable USB drive for. + [[figu-fedora_media_writer_choose_flavor_linux]] .Fedora Media Writer Main Screen: Choose your Edition of Fedora + -image::fedora_media_writer/main_screen.png[Image of Fedora Image Writer Main Screen] +image::fedora_media_writer/main_screen.png[Image of Fedora Media Writer Main Screen] . If you choose one of the beginning default Fedora editions, such as Fedora workstation or server. [application]*Fedora Media Writer* will give you information and details about it before you proceed with the download and USB creation. For Fedora Workstation, you can choose a different architecture, such as 32bit if you select "other architectures". Otherwise select "Create Live USB" to proceed. @@ -225,14 +222,14 @@ before you proceed with the download and USB creation. For Fedora Workstation, y [[figu-fedora_media_writer_distro_information_fedora]] .Fedora Media Writer Distro Information + -image::fedora_media_writer/distro_information.png[Image of Fedora Image Writer Distro Information Screen] +image::fedora_media_writer/distro_information.png[Image of Fedora Media Writer Distro Information Screen] . Fedora Media Writer will automatically download the ISO for you, but if you all-ready have it in your Downloads directory it will be immediately available to use. + [[figu-fedora_media_writer_Automatic_download_fedora]] .Fedora Media Writer Automatic Download + -image::fedora_media_writer/automatic_download.png[Image of Fedora Image Writer Automatic Download] +image::fedora_media_writer/automatic_download.png[Image of Fedora Media Writer Automatic Download] . After the download completes, or when [application]*Fedora Media Writer* is ready. Plug in a USB drive you wish to use as a bootable media. @@ -241,7 +238,7 @@ image::fedora_media_writer/automatic_download.png[Image of Fedora Image Writer A [[figu-fedora_media_writer_write_to_device_linux]] .Fedora Media Writer Write to USB Device + -image::fedora_media_writer/write_to_device.png[Image of Fedora Image Writer write to device red button] +image::fedora_media_writer/write_to_device.png[Image of Fedora Media Writer write to device red button] .Creating USB Media on Macintosh . Download the latest Macintosh Disk Image (the package will have a .dmg extension) from Marin Briza's github page: link:++https://github.com/MartinBriza/MediaWriter/releases++[https://github.com/MartinBriza/MediaWriter/releases]. @@ -257,7 +254,7 @@ image::fedora_media_writer/write_to_device.png[Image of Fedora Image Writer writ [[figu-fedora_media_writer_choose_flavor_mac]] .Fedora Media Writer Main Screen: Choose your Edition of Fedora + -image::fedora_media_writer/main_screen.png[Image of Fedora Image Writer Main Screen] +image::fedora_media_writer/main_screen.png[Image of Fedora Media Writer Main Screen] . If you choose one of the beginning default Fedora editions, such as Fedora workstation or server. [application]*Fedora Media Writer* will give you information and details about it before you proceed with the download and USB creation. For Fedora Workstation, you can choose a different architecture, such as 32bit if you select "other architectures". Otherwise select "Create Live USB" to proceed. @@ -265,14 +262,14 @@ before you proceed with the download and USB creation. For Fedora Workstation, y [[figu-fedora_media_writer_distro_information_mac]] .Fedora Media Writer Distro Information + -image::fedora_media_writer/distro_information.png[Image of Fedora Image Writer Distro Information Screen] +image::fedora_media_writer/distro_information.png[Image of Fedora Media Writer Distro Information Screen] . Fedora Media Writer will automatically download the ISO for you, but if you all-ready have it in your Downloads directory it will be immediately available to use. + [[figu-fedora_media_writer_Automatic_download_mac]] .Fedora Media Writer Automatic Download + -image::fedora_media_writer/automatic_download.png[Image of Fedora Image Writer Automatic Download] +image::fedora_media_writer/automatic_download.png[Image of Fedora Media Writer Automatic Download] . After the download completes, or when [application]*Fedora Media Writer* is ready. Plug in a USB drive you wish to use as a bootable media. @@ -281,7 +278,7 @@ image::fedora_media_writer/automatic_download.png[Image of Fedora Image Writer A [[figu-fedora_media_writer_write_to_device_mac]] .Fedora Media Writer Write to USB Device + -image::fedora_media_writer/write_to_device.png[Image of Fedora Image Writer write to device red button] +image::fedora_media_writer/write_to_device.png[Image of Fedora Media Writer write to device red button] .Creating USB media with [application]*GNOME Disks* . On a system with [application]*GNOME*, or with the [package]*gnome-disk-utility* package installed, open `Disks` using the system menu. @@ -299,7 +296,6 @@ image::fedora_media_writer/write_to_device.png[Image of Fedora Image Writer writ + [subs="quotes, macros, attributes"] ---- - $ [command]#dmesg|tail# [288954.686557] usb 2-1.8: New USB device strings: Mfr=0, Product=1, SerialNumber=2 [288954.686559] usb 2-1.8: Product: USB Storage @@ -310,8 +306,7 @@ $ [command]#dmesg|tail# [288954.716682] usbcore: registered new interface driver uas [288955.717140] scsi 6:0:0:0: Direct-Access Generic STORAGE DEVICE 9228 PQ: 0 ANSI: 0 [288955.717745] sd 6:0:0:0: Attached scsi generic sg4 type 0 -[288961.876382] sd 6:0:0:0: `[sdd]` Attached SCSI removable disk - +[288961.876382] sd 6:0:0:0: *sdd* Attached SCSI removable disk ---- . Use the [command]#dd# utility to write the image. *Make sure you have the right drive!* From a6de7ca782fd4b15bcdd12c7127a4b1bad3501bb Mon Sep 17 00:00:00 2001 From: Zach Ploskey Date: Sep 15 2017 20:18:49 +0000 Subject: [PATCH 3/4] Remove note about Fedora 24 --- diff --git a/en-US/install/Preparing_for_Installation.adoc b/en-US/install/Preparing_for_Installation.adoc index accf811..15472d9 100644 --- a/en-US/install/Preparing_for_Installation.adoc +++ b/en-US/install/Preparing_for_Installation.adoc @@ -194,12 +194,6 @@ image::fedora_media_writer/write_to_device.png[Image of Fedora Media Writer writ $ [command]#sudo dnf install mediawriter# ---- + -[TIP] -==== -In Fedora 24 and earlier this package and binary are named `liveusb-creator`, -so replace `mediawriter` with `liveusb-creator`. -==== -+ . You can call [application]*Fedora Media Writer* by issuing the command: + [subs="quotes, macros, attributes"] From c0003640e49e8d8ad62c4b33ebf6a6248651ec88 Mon Sep 17 00:00:00 2001 From: Zach Ploskey Date: Sep 15 2017 20:20:26 +0000 Subject: [PATCH 4/4] Update name of folder Fedora Media Writer appears in Signed-off-by: Zach Ploskey --- diff --git a/en-US/install/Preparing_for_Installation.adoc b/en-US/install/Preparing_for_Installation.adoc index 15472d9..b523a80 100644 --- a/en-US/install/Preparing_for_Installation.adoc +++ b/en-US/install/Preparing_for_Installation.adoc @@ -201,7 +201,7 @@ $ [command]#sudo dnf install mediawriter# $ [command]#sudo mediawriter# ---- + -or in [application]*Gnome 3* by selecting *activities,* then selecting *system tools*, and then selecting [application]*Fedora Media Writer*. +or in [application]*Gnome 3* by selecting *Activities,* then selecting *Utilities*, and then selecting [application]*Fedora Media Writer*. + . Select the Fedora Edition you wish to make a bootable USB drive for. +