diff options
| author | Joey Hess <joeyh@debian.org> | 2006-01-03 18:17:58 +0000 |
|---|---|---|
| committer | Joey Hess <joeyh@debian.org> | 2006-01-03 18:17:58 +0000 |
| commit | 70bad074da8c3e7adeb7c4747c89daa807941a0c (patch) | |
| tree | 86750ff33ece22d1698a22312d47b0453663d247 /build | |
| parent | c8cbe15f33b5aae7da53da28f27ced90e0e9cf7b (diff) | |
| download | installation-guide-70bad074da8c3e7adeb7c4747c89daa807941a0c.zip | |
merge in ex-base-config branch
Diffstat (limited to 'build')
| -rwxr-xr-x | build/build.sh | 7 | ||||
| -rw-r--r-- | build/templates/docstruct.ent | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/build/build.sh b/build/build.sh index a877aaa7c..c14b852ae 100755 --- a/build/build.sh +++ b/build/build.sh @@ -68,16 +68,11 @@ for lang in $languages; do [ -n "$USES_PO" ] && rm -r ../$lang || true done -if [ "$manual_release" = "etch" ] ; then +if [ "$manual_release" != "sarge" ] ; then 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" - 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 b0202c3d1..915e362e5 100644 --- a/build/templates/docstruct.ent +++ b/build/templates/docstruct.ent @@ -121,6 +121,11 @@ <!ENTITY module-base-installer.xml SYSTEM "##SRCPATH##/using-d-i/modules/base-installer.xml"> <!ENTITY module-kernel-chooser.xml SYSTEM "##SRCPATH##/using-d-i/modules/kernel-chooser.xml"> <!ENTITY module-os-prober.xml SYSTEM "##SRCPATH##/using-d-i/modules/os-prober.xml"> + <!ENTITY module-tzsetup.xml SYSTEM "##SRCPATH##/using-d-i/modules/tzsetup.xml"> + <!ENTITY module-clock-setup.xml SYSTEM "##SRCPATH##/using-d-i/modules/clock-setup.xml"> + <!ENTITY module-user-setup.xml SYSTEM "##SRCPATH##/using-d-i/modules/user-setup.xml"> + <!ENTITY module-apt-setup.xml SYSTEM "##SRCPATH##/using-d-i/modules/apt-setup.xml"> + <!ENTITY module-pkgsel.xml SYSTEM "##SRCPATH##/using-d-i/modules/pkgsel.xml"> <!ENTITY module-mips-arcboot-installer.xml SYSTEM "##SRCPATH##/using-d-i/modules/mips/arcboot-installer.xml"> <!ENTITY module-mipsel-colo-installer.xml SYSTEM "##SRCPATH##/using-d-i/modules/mipsel/colo-installer.xml"> @@ -193,8 +198,6 @@ <!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 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"> |