diff options
| -rw-r--r-- | build/arch-options/amd64 | 2 | ||||
| -rw-r--r-- | build/arch-options/i386 | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | en/install-methods/boot-usb-files.xml | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64 index db9f6376d..69ee45057 100644 --- a/build/arch-options/amd64 +++ b/build/arch-options/amd64 @@ -19,7 +19,7 @@ smp_config_option="Symmetric multi-processing support" # in the build scripts fdisk="fdisk.txt;cfdisk.txt" network="supports-tftp;supports-bootp;supports-nfsroot" -boot="bootable-disk;bootable-usb;isohybrid-supported" +boot="bootable-disk;bootable-usb;isohybrid-supported;manual-usb-prep-supported" frontend="newt;gtk" other="supports-wireless;supports-pcmcia;supports-serial-console" smp="smp-alternatives" diff --git a/build/arch-options/i386 b/build/arch-options/i386 index 9d155392f..4024917ae 100644 --- a/build/arch-options/i386 +++ b/build/arch-options/i386 @@ -19,7 +19,7 @@ smp_config_option="Symmetric multi-processing support" # in the build scripts fdisk="fdisk.txt;cfdisk.txt" network="supports-tftp;supports-bootp;supports-nfsroot" -boot="bootable-disk;bootable-usb;isohybrid-supported" +boot="bootable-disk;bootable-usb;isohybrid-supported;manual-usb-prep-supported" frontend="newt;gtk" other="supports-wireless;supports-pcmcia;supports-serial-console" smp="smp-alternatives" diff --git a/debian/changelog b/debian/changelog index a991d134e..10294bdb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ installation-guide (20200110) UNRELEASED; urgency=medium * Move advise for downloading netboot/hd-media files from chapter 5.1.5. to 4.4.1. where it belongs. And convert filenames into clickable links. Closes: #284760 + * Add condition 'manual-usb-prep-supported' to display chapters for manual + USB stick preparation in amd64 and i386 only (chapter was also active + for arm64 before, but needs an overhaul first, to be useful). [ Changwoo Ryu ] * Improve Korean pdf diff --git a/en/install-methods/boot-usb-files.xml b/en/install-methods/boot-usb-files.xml index 12d81924c..ef8984050 100644 --- a/en/install-methods/boot-usb-files.xml +++ b/en/install-methods/boot-usb-files.xml @@ -106,7 +106,7 @@ USB stick should make the two partitions visible. </sect2> - <sect2 id="usb-copy-easy"> + <sect2 id="usb-copy-easy" condition="manual-usb-prep-supported"> <title>Manually copying files to the USB stick</title> <para> @@ -166,7 +166,7 @@ Unmount the stick (<userinput>umount /mnt</userinput>) and you are done. </para> </sect2> - <sect2 id="usb-copy-flexible"> + <sect2 id="usb-copy-flexible" condition="manual-usb-prep-supported"> <title>Manually copying files to the USB stick — the flexible way</title> <para> |