diff options
-rw-r--r-- | build/arch-options/alpha | 2 | ||||
-rw-r--r-- | build/arch-options/amd64 | 4 | ||||
-rw-r--r-- | build/arch-options/arm | 2 | ||||
-rw-r--r-- | build/arch-options/hppa | 2 | ||||
-rw-r--r-- | build/arch-options/i386 | 4 | ||||
-rw-r--r-- | build/arch-options/ia64 | 2 | ||||
-rw-r--r-- | build/arch-options/m68k | 2 | ||||
-rw-r--r-- | build/arch-options/mips | 2 | ||||
-rw-r--r-- | build/arch-options/mipsel | 2 | ||||
-rw-r--r-- | build/arch-options/powerpc | 2 | ||||
-rw-r--r-- | build/arch-options/s390 | 2 | ||||
-rw-r--r-- | build/arch-options/sparc | 2 | ||||
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | en/appendix/graphical.xml | 19 | ||||
-rw-r--r-- | en/hardware/memory-disk-requirements.xml | 24 |
15 files changed, 52 insertions, 22 deletions
diff --git a/build/arch-options/alpha b/build/arch-options/alpha index 33856b7c5..0e3addf57 100644 --- a/build/arch-options/alpha +++ b/build/arch-options/alpha @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="alpha;not-x86;not-s390;not-m68k;not-powerpc" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="alpha" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/amd64 b/build/arch-options/amd64 index 89cb07a36..dc2bb2aa8 100644 --- a/build/arch-options/amd64 +++ b/build/arch-options/amd64 @@ -3,9 +3,9 @@ # It is sourced by the build scripts archspec="amd64;x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="amd64" -minimum_memory=48 +minimum_memory=56 minimum_memory_gtk=96 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" diff --git a/build/arch-options/arm b/build/arch-options/arm index 8605b23b0..d5a7209b3 100644 --- a/build/arch-options/arm +++ b/build/arch-options/arm @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="arm;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="arm" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/hppa b/build/arch-options/hppa index 4d23ff66f..849b4a6d8 100644 --- a/build/arch-options/hppa +++ b/build/arch-options/hppa @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="hppa;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="hppa" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/i386 b/build/arch-options/i386 index 3dbe1045a..499ca7ae8 100644 --- a/build/arch-options/i386 +++ b/build/arch-options/i386 @@ -3,9 +3,9 @@ # It is sourced by the build scripts archspec="i386;x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="boot" -minimum_memory=48 +minimum_memory=44 minimum_memory_gtk=96 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" diff --git a/build/arch-options/ia64 b/build/arch-options/ia64 index 54d25435b..0b8bb6cbf 100644 --- a/build/arch-options/ia64 +++ b/build/arch-options/ia64 @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="ia64;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="ia64" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/m68k b/build/arch-options/m68k index 18b596f77..a99f4734f 100644 --- a/build/arch-options/m68k +++ b/build/arch-options/m68k @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="m68k;not-x86;not-s390;not-powerpc;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="68k" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/mips b/build/arch-options/mips index 50cff66d1..b722aa15d 100644 --- a/build/arch-options/mips +++ b/build/arch-options/mips @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="mips;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="mips" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel index 447abe219..20e9ec593 100644 --- a/build/arch-options/mipsel +++ b/build/arch-options/mipsel @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="mipsel;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="mips" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc index 3f859053b..10aefda50 100644 --- a/build/arch-options/powerpc +++ b/build/arch-options/powerpc @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="powerpc;not-s390;not-m68k;not-x86;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="powerpc" minimum_memory=32 minimum_memory_gtk=128 diff --git a/build/arch-options/s390 b/build/arch-options/s390 index 4a4c41796..882e56876 100644 --- a/build/arch-options/s390 +++ b/build/arch-options/s390 @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="s390;not-powerpc;not-m68k;not-x86;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="s390" minimum_memory=20 # These two options should be set if condition 'smp' is set below diff --git a/build/arch-options/sparc b/build/arch-options/sparc index b10a725c9..c214001b7 100644 --- a/build/arch-options/sparc +++ b/build/arch-options/sparc @@ -3,7 +3,7 @@ # It is sourced by the build scripts archspec="sparc;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" -kernelversion="2.6.18" +kernelversion="2.6.24" arch_listname="sparc" minimum_memory=32 # These two options should be set if condition 'smp' is set below diff --git a/debian/changelog b/debian/changelog index da3bb057e..d31ba9588 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,9 @@ installation-guide (2008xxxx) UNRELEASED; urgency=low * Document preseeding of grub password. * Update how to suppress the removal of existing LVM data using preseeding. * Update version of X11 used in Lenny. + * Update kernel versions. + * Update memory requirements for i386 and amd64. Elaborate on installing + systems with less memory than the listed minimum. [ Joey Hess ] * Remove autopartkit from the module list. diff --git a/en/appendix/graphical.xml b/en/appendix/graphical.xml index 7ccb34fb0..543b5fefa 100644 --- a/en/appendix/graphical.xml +++ b/en/appendix/graphical.xml @@ -61,6 +61,15 @@ an ATI graphical card, but is unlikely to work on other systems. </para><para> +Just as with the regular installer it is possible to add boot parameters +when starting the graphical installer. One of those parameters allows to +configure the mouse for left-handed use. Others allow to select the mouse +device (e.g. for a serial mouse) and the mouse protocol. +See <xref linkend="boot-parms"/> for valid parameters. + +</para> +<note><para> + The graphical installer requires significantly more memory to run than the regular installer: &minimum-memory-gtk;. If insufficient memory is available, it will automatically fall back to the regular @@ -68,12 +77,12 @@ available, it will automatically fall back to the regular </para><para> -You can add boot parameters when starting the graphical installer, just as -with the regular installer. One of those parameters allows you to configure -the mouse for left-handed use. See <xref linkend="boot-parms"/> for valid -parameters. +If the amount of memory in your system is below &minimum-memory;, +the graphical installer may fail to boot at all while booting the +regular installer would still work. Using the regular installer is +recommended for systems with little available memory. -</para> +</para></note> <sect2 id="gtk-using"> <title>Using the graphical installer</title> diff --git a/en/hardware/memory-disk-requirements.xml b/en/hardware/memory-disk-requirements.xml index 930778552..7adc6961e 100644 --- a/en/hardware/memory-disk-requirements.xml +++ b/en/hardware/memory-disk-requirements.xml @@ -6,9 +6,27 @@ <para> -You must have at least &minimum-memory; of memory and &minimum-fs-size; of hard disk -space. Note that these are really bare-minimum numbers. For more realistic -figures, see <xref linkend="minimum-hardware-reqts"/>. +You must have at least &minimum-memory; of memory and &minimum-fs-size; +of hard disk space to perform a normal installation. Note that these are +fairly minimal numbers. For more realistic figures, see +<xref linkend="minimum-hardware-reqts"/>. + +</para><para> + +Installation on systems with less memory<footnote condition="gtk"> + +<para> + +Installation images that support the graphical installer require more +memory than images that support only the textual installer and should +not be used on systems with less than &minimum-memory; of memory. If +there is a choice between booting the regular and the graphical installer, +the former should be selected. + +</para> + +</footnote> or disk space available may be possible but is only advised for +experienced users. </para><para arch="m68k"> |