summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Wansing <holgerw@debian.org>2017-08-17 21:06:13 +0000
committerHolger Wansing <holgerw@debian.org>2017-08-17 21:06:13 +0000
commit7dc450c05053b5901ef810b7191bbdae17df5178 (patch)
tree9317a30dad986ecf596c5a3a165f397889c6030e
parent3aa082a832ed636874995bf9e7bd25d0910c3365 (diff)
downloadinstallation-guide-7dc450c05053b5901ef810b7191bbdae17df5178.zip
Set forgotten conditions 'bootable-usb' and 'isohybrid-supported' for
arm64. This leads to the need of some content about how to select the boot device for arm64. Added a placeholder for that, content to be added.
-rw-r--r--build/arch-options/arm642
-rw-r--r--debian/changelog2
-rw-r--r--en/preparing/bios-setup/arm.xml7
3 files changed, 10 insertions, 1 deletions
diff --git a/build/arch-options/arm64 b/build/arch-options/arm64
index 87012a7bc..7ac0d3b51 100644
--- a/build/arch-options/arm64
+++ b/build/arch-options/arm64
@@ -19,7 +19,7 @@ smp_config_option="Symmetric Multi-Processing"
# in the build scripts
fdisk="fdisk.txt;cfdisk.txt"
network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
-boot=""
+boot="bootable-usb;isohybrid-supported"
frontend="newt;not-gtk"
other="supports-serial-console"
smp="defaults-smp"
diff --git a/debian/changelog b/debian/changelog
index 0dc235e90..52a7a84a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ installation-guide (2017XXXX) UNRELEASED; urgency=medium
* Fix typo in supported ARM devices section. Closes: #869932
* Remove support for 'ps' output format, therefore remove depends openjade,
jadetex, ko.tex-base and cm-super as well. Closes: #871751
+ * Set forgotten conditions 'bootable-usb' and 'isohybrid-supported' for
+ arm64.
[ Martin Michlmayr ]
* Remove QNAP TS-109, TS-209 and TS-409 as they are no longer supported.
diff --git a/en/preparing/bios-setup/arm.xml b/en/preparing/bios-setup/arm.xml
index cfb9e867b..6a89a3073 100644
--- a/en/preparing/bios-setup/arm.xml
+++ b/en/preparing/bios-setup/arm.xml
@@ -2,6 +2,13 @@
<!-- $Id$ -->
+ <sect2 arch="arm64" id="boot-dev-select"><title>Boot Device Selection</title>
+
+ <para>
+<!-- placeholder, content to be added -->
+ </para>
+ </sect2>
+
<sect2 arch="arm" id="arm-firmware-overview"><title>ARM firmware</title>
<para>