diff options
| -rwxr-xr-x | build/build.sh | 3 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 19 |
3 files changed, 23 insertions, 2 deletions
diff --git a/build/build.sh b/build/build.sh index 8aa65553e..77ac9539d 100755 --- a/build/build.sh +++ b/build/build.sh @@ -59,7 +59,8 @@ PRESEED="../en/appendix/preseed.xml" if [ -f $PRESEED ] && [ -f preseed.pl ] ; then for arch in $architectures; do eval arch_destination=$destination - ./preseed.pl -r $manual_release $PRESEED >$arch_destination/example-preseed.txt + echo '#_preseed_V1' >$arch_destination/example-preseed.txt + ./preseed.pl -r $manual_release $PRESEED >>$arch_destination/example-preseed.txt done fi diff --git a/debian/changelog b/debian/changelog index 3cd1aeba3..e7ad12b93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ installation-guide (2017XXXX) UNRELEASED; urgency=medium speech. * Update distrib name about the absence of graphical installer on arm64. + [ Geert Stappers ] + * Add header to preseed file. Closes: #859438 + [ Holger Wansing ] * Set TMPDIR variable, to get dblatex debugging files removed after pdf build. Closes: #859150 diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index 9adcff049..a1f19e49e 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -633,6 +633,18 @@ a line in a preconfiguration file is: </para><para> +The file should start with <literal>#_preseed_V1</literal> +<!-- + The "should" is for the Stretch release, + so later releases use the comment + as a magic string to identify a preseed file + + see also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848726 +--> + + +</para><para> + There are a few rules to keep in mind when writing a preconfiguration file. </para> @@ -667,6 +679,10 @@ There are a few rules to keep in mind when writing a preconfiguration file. Some questions take a code as value instead of the English text that is shown during installation. </para></listitem> +<listitem><para> + Start with <literal>#_preseed_V1</literal> + <!-- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848726 --> +</para></listitem> </itemizedlist> <para> @@ -682,7 +698,8 @@ rebooting, use the <command>debconf-get-selections</command> from the database and the installer's cdebconf database to a single file: <informalexample><screen> -$ debconf-get-selections --installer > <replaceable>file</replaceable> +$ echo "#_preseed_V1" > <replaceable>file</replaceable> +$ debconf-get-selections --installer >> <replaceable>file</replaceable> $ debconf-get-selections >> <replaceable>file</replaceable> </screen></informalexample> |