diff options
| author | Frans Pop <elendil@planet.nl> | 2005-11-25 18:49:08 +0000 |
|---|---|---|
| committer | Frans Pop <elendil@planet.nl> | 2005-11-25 18:49:08 +0000 |
| commit | 855c0e85e0eb178edd2b10589cc570c711c206d6 (patch) | |
| tree | 19e2ebec9393f76e035c3cec972a7195027c96fc /build | |
| parent | cc8859c4fb8eeb7c6fd4e493dfad1477390cd55a (diff) | |
| download | installation-guide-855c0e85e0eb178edd2b10589cc570c711c206d6.zip | |
- Move documentation on preseeding to separate appendix for etch
- Use new, more flexible perl script to extract example preseed file from new appendix
Diffstat (limited to 'build')
| -rwxr-xr-x | build/build.sh | 13 | ||||
| -rw-r--r-- | build/templates/docstruct.ent | 2 | ||||
| -rw-r--r-- | build/templates/install.xml.template | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/build/build.sh b/build/build.sh index 991a62070..a877aaa7c 100755 --- a/build/build.sh +++ b/build/build.sh @@ -69,14 +69,15 @@ for lang in $languages; do done if [ "$manual_release" = "etch" ] ; then - PRESEED="../en/appendix/example-preseed-etch.xml" - LCKEEP="-v lckeep=1" + PRESEED="../en/appendix/preseed.xml" + if [ -f $PRESEED ] && [ -f preseed.pl ] ; then + ./preseed.pl -r $manual_release $PRESEED >$destination/example-preseed.txt + fi else PRESEED="../en/appendix/example-preseed-sarge.xml" - LCKEEP="" -fi -if [ -f $PRESEED ] && [ -f preseed.awk ] ; then - gawk -f preseed.awk $LCKEEP $PRESEED >$destination/example-preseed.txt + if [ -f $PRESEED ] && [ -f preseed.awk ] ; then + gawk -f preseed.awk $LCKEEP $PRESEED >$destination/example-preseed.txt + fi fi clear_po diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent index de75b0949..b0202c3d1 100644 --- a/build/templates/docstruct.ent +++ b/build/templates/docstruct.ent @@ -191,10 +191,10 @@ <!ENTITY tech-info.xml SYSTEM "##SRCPATH##/tech-info/tech-info.xml"> <!ENTITY installation-howto.xml SYSTEM "##SRCPATH##/howto/installation-howto.xml"> + <!ENTITY preseed.xml SYSTEM "##SRCPATH##/appendix/preseed.xml"> <!ENTITY random-bits.xml SYSTEM "##SRCPATH##/appendix/random-bits.xml"> <!ENTITY example-preseed.xml SYSTEM "##SRCPATH##/appendix/example-preseed.xml"> <!ENTITY example-preseed-sarge.xml SYSTEM "##SRCPATH##/appendix/example-preseed-sarge.xml"> - <!ENTITY example-preseed-etch.xml SYSTEM "##SRCPATH##/appendix/example-preseed-etch.xml"> <!ENTITY files.xml SYSTEM "##SRCPATH##/appendix/files.xml"> <!ENTITY chroot-install.xml SYSTEM "##SRCPATH##/appendix/chroot-install.xml"> <!ENTITY plip.xml SYSTEM "##SRCPATH##/appendix/plip.xml"> diff --git a/build/templates/install.xml.template b/build/templates/install.xml.template index 1bfb0b7ea..038e7ae33 100644 --- a/build/templates/install.xml.template +++ b/build/templates/install.xml.template @@ -39,6 +39,7 @@ <!-- coming soon to a cvs site near you --> <!-- &tech-info.xml; --> &installation-howto.xml; +&preseed.xml; &partitioning.xml; &random-bits.xml; &administrivia.xml; |