diff options
| -rw-r--r-- | build/arch-options/alpha | 1 | ||||
| -rw-r--r-- | build/arch-options/amd64 | 1 | ||||
| -rw-r--r-- | build/arch-options/arm | 1 | ||||
| -rw-r--r-- | build/arch-options/hppa | 1 | ||||
| -rw-r--r-- | build/arch-options/i386 | 1 | ||||
| -rw-r--r-- | build/arch-options/ia64 | 1 | ||||
| -rw-r--r-- | build/arch-options/m68k | 1 | ||||
| -rw-r--r-- | build/arch-options/mips | 1 | ||||
| -rw-r--r-- | build/arch-options/mipsel | 1 | ||||
| -rw-r--r-- | build/arch-options/powerpc | 1 | ||||
| -rw-r--r-- | build/arch-options/s390 | 1 | ||||
| -rw-r--r-- | build/arch-options/sparc | 1 | ||||
| -rwxr-xr-x | build/buildone.sh | 2 | ||||
| -rw-r--r-- | build/entities/common.ent | 55 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | en/appendix/files.xml | 64 | ||||
| -rw-r--r-- | en/hardware/memory-disk-requirements.xml | 7 | ||||
| -rw-r--r-- | en/preparing/minimum-hardware-reqts.xml | 113 |
18 files changed, 129 insertions, 129 deletions
diff --git a/build/arch-options/alpha b/build/arch-options/alpha index 2997a3531..5b6741dd9 100644 --- a/build/arch-options/alpha +++ b/build/arch-options/alpha @@ -5,6 +5,7 @@ archspec="alpha;not-x86;not-s390;not-m68k;not-powerpc" kernelversion="2.6.18" arch_listname="alpha" +minimum_memory=32 # These two options should be set if condition 'smp' is set below smp_config_section="General setup" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/amd64 b/build/arch-options/amd64 index 9af33c4c7..14722a043 100644 --- a/build/arch-options/amd64 +++ b/build/arch-options/amd64 @@ -5,6 +5,7 @@ archspec="amd64;x86;not-s390;not-m68k;not-powerpc;not-alpha" kernelversion="2.6.18" arch_listname="amd64" +minimum_memory=48 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/arm b/build/arch-options/arm index c1aad4753..3ffe74828 100644 --- a/build/arch-options/arm +++ b/build/arch-options/arm @@ -5,6 +5,7 @@ archspec="arm;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" kernelversion="2.6.18" arch_listname="arm" +minimum_memory=32 # These two options should be set if condition 'smp' is set below smp_config_section="N/A" smp_config_option="N/A" diff --git a/build/arch-options/hppa b/build/arch-options/hppa index e275b0d65..52e1ced88 100644 --- a/build/arch-options/hppa +++ b/build/arch-options/hppa @@ -5,6 +5,7 @@ archspec="hppa;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" kernelversion="2.6.18" arch_listname="hppa" +minimum_memory=32 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/i386 b/build/arch-options/i386 index db3e75a98..97b3d79e4 100644 --- a/build/arch-options/i386 +++ b/build/arch-options/i386 @@ -5,6 +5,7 @@ archspec="i386;x86;not-s390;not-m68k;not-powerpc;not-alpha" kernelversion="2.6.18" arch_listname="boot" +minimum_memory=48 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/ia64 b/build/arch-options/ia64 index 1450634f5..62fda7811 100644 --- a/build/arch-options/ia64 +++ b/build/arch-options/ia64 @@ -5,6 +5,7 @@ archspec="ia64;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" kernelversion="2.6.18" arch_listname="ia64" +minimum_memory=32 # These two options should be set if condition 'smp' is set below smp_config_section="General setup" smp_config_option="SMP support" diff --git a/build/arch-options/m68k b/build/arch-options/m68k index ce44e8880..eb219bd95 100644 --- a/build/arch-options/m68k +++ b/build/arch-options/m68k @@ -5,6 +5,7 @@ archspec="m68k;not-x86;not-s390;not-powerpc;not-alpha" kernelversion="2.6.18" arch_listname="68k" +minimum_memory=32 # These two options should be set if condition 'smp' is set below smp_config_section="N/A" smp_config_option="N/A" diff --git a/build/arch-options/mips b/build/arch-options/mips index d0d31f9d4..14c9288e1 100644 --- a/build/arch-options/mips +++ b/build/arch-options/mips @@ -5,6 +5,7 @@ archspec="mips;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" kernelversion="2.6.18" arch_listname="mips" +minimum_memory=32 # These two options should be set if condition 'smp' is set below smp_config_section="N/A" smp_config_option="N/A" diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel index efb408018..22d668730 100644 --- a/build/arch-options/mipsel +++ b/build/arch-options/mipsel @@ -5,6 +5,7 @@ archspec="mipsel;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" kernelversion="2.6.18" arch_listname="mips" +minimum_memory=32 # These two options should be set if condition 'smp' is set below smp_config_section="N/A" smp_config_option="N/A" diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc index eff2c2447..69ad17303 100644 --- a/build/arch-options/powerpc +++ b/build/arch-options/powerpc @@ -5,6 +5,7 @@ archspec="powerpc;not-s390;not-m68k;not-x86;not-alpha" kernelversion="2.6.18" arch_listname="powerpc" +minimum_memory=32 # These two options should be set if condition 'smp' is set below smp_config_section="Platform support" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/s390 b/build/arch-options/s390 index e9925bf1b..0945f2665 100644 --- a/build/arch-options/s390 +++ b/build/arch-options/s390 @@ -5,6 +5,7 @@ archspec="s390;not-powerpc;not-m68k;not-x86;not-alpha" kernelversion="2.6.18" arch_listname="s390" +minimum_memory=20 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" smp_config_option="Symmetric multi-processing support" diff --git a/build/arch-options/sparc b/build/arch-options/sparc index ed65c595f..8138400ce 100644 --- a/build/arch-options/sparc +++ b/build/arch-options/sparc @@ -5,6 +5,7 @@ archspec="sparc;not-x86;not-s390;not-m68k;not-powerpc;not-alpha" kernelversion="2.6.18" arch_listname="sparc" +minimum-memory=32 # These two options should be set if condition 'smp' is set below smp_config_section="General setup" smp_config_option="Symmetric multi-processing support" diff --git a/build/buildone.sh b/build/buildone.sh index bedb81c4e..37a6d8278 100755 --- a/build/buildone.sh +++ b/build/buildone.sh @@ -89,6 +89,8 @@ create_profiled () { echo "<!ENTITY altkernelversion \"${altkernelversion}\">" >> $dynamic echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic echo "<!ENTITY smp-config-option \"${smp_config_option}\">" >> $dynamic + echo "<!ENTITY minimum-memory \"${minimum_memory}¬ation-megabytes;\">" >> $dynamic + sed "s:##SRCPATH##:$source_path:" templates/docstruct.ent >> $dynamic sed "s:##LANG##:$language:g" templates/install.xml.template | \ diff --git a/build/entities/common.ent b/build/entities/common.ent index 09c4a270a..32594087f 100644 --- a/build/entities/common.ent +++ b/build/entities/common.ent @@ -24,52 +24,39 @@ <!ENTITY MSG-YES "<userinput>Yes</userinput>"> <!ENTITY MSG-NO "<userinput>No</userinput>"> -<!-- available language codes for 'setlang [code]' --> -<!ENTITY setlang-language-code-list "ca cs da de eo es fi fr gl hr hu it ko ja pl pt ru sk sv tr zh_CN"> - <!-- notation used for 'megabytes' --> <!ENTITY notation-megabytes "MB"> -<!-- minimum memory --> -<!ENTITY minimum-memory "32¬ation-megabytes;"> - <!-- minimum hard disk size for base system --> -<!-- As measured on a completed woody install, work space included. --> -<!ENTITY minimum-fs-size "110¬ation-megabytes;"> - -<!-- minimum total memory (RAM + swap is ok) needed, i.e., for kernel --> -<!-- module config --> -<!ENTITY minimum-memory-with-swap "9¬ation-megabytes;"> - -<!-- minimum memory for diskless workstations (NFS root) --> -<!ENTITY minimum-memory-with-nfsroot "16¬ation-megabytes;"> +<!-- As measured on a completed etch install, minimal work space included. --> +<!ENTITY minimum-fs-size "500¬ation-megabytes;"> <!-- number of packages, approx, in the main distribution --> -<!-- do: grep '^Package:' Packages | wc -l --> -<!-- might be fun to generate this dynamically --> -<!-- last updated: May 15 2005 (FJP) --> +<!-- use: + for i in binary-*; do echo -n "$i: "; zgrep '^Package:' $i/Packages.gz | wc -l; done +--> +<!-- last updated: January 1 2007 for Etch (FJP) --> <!ENTITY num-of-distrib-pkgs - "<phrase arch='alpha'>14750</phrase> - <phrase arch='arm'>14650</phrase> - <phrase arch='hppa'>14700</phrase> - <phrase arch='i386'>15250</phrase> - <phrase arch='ia64'>14700</phrase> - <phrase arch='m68k'>14700</phrase> - <phrase arch='mips'>14650</phrase> - <phrase arch='mipsel'>14600</phrase> - <phrase arch='powerpc'>14900</phrase> - <phrase arch='sparc'>14800</phrase> - <phrase arch='s390'>14700</phrase>"> + "<phrase arch='alpha'>17600</phrase> + <phrase arch='amd64'>17850</phrase> + <phrase arch='arm'>17550</phrase> + <phrase arch='hppa'>17600</phrase> + <phrase arch='i386'>18150</phrase> + <phrase arch='ia64'>17650</phrase> + <phrase arch='m68k'>17450</phrase> + <phrase arch='mips'>17550</phrase> + <phrase arch='mipsel'>17550</phrase> + <phrase arch='powerpc'>17850</phrase> + <phrase arch='s390'>17500</phrase> + <phrase arch='sparc'>17700</phrase>"> <!-- Number of current Debian developers --> -<!ENTITY num-of-debian-developers "900"> +<!-- Can be found for example on vote.debian.org (use last vote) --> +<!ENTITY num-of-debian-developers "1000"> <!-- Number of current Debian maillists --> -<!ENTITY num-of-debian-maillists "160"> - -<!-- threshold, below which, we are a low memory system --> -<!ENTITY low-mem-threshold "5¬ation-megabytes;"> +<!ENTITY num-of-debian-maillists "215"> <!-- version of X11 shipping with the current release --> <!ENTITY x11ver "7.1"> diff --git a/debian/changelog b/debian/changelog index 0cae21a8a..3cfaa6aa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -103,6 +103,9 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low for Sparc. Many thanks to Jurij Smakov for reviewing the Sparc manual and for his overview of issues. * Etch ships with X.Org 7.1. + * Update number of developers, packages and mailing lists. + * General revision of minimum hardware requirements throughout the manual. + * Update of installed/download size of tasks. * bookinfo: - Add note for m68k that it is not a release architecture for Etch. * hardware: @@ -151,7 +154,7 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low * appendix/chroot-install: - Changes suggested in review by Wiktor Wandachowicz. Closes: #394929. - -- Frans Pop <fjp@debian.org> Sun, 31 Dec 2006 23:08:33 +0100 + -- Frans Pop <fjp@debian.org> Mon, 1 Jan 2007 11:49:34 +0100 installation-guide (20060726) unstable; urgency=low diff --git a/en/appendix/files.xml b/en/appendix/files.xml index c6600ca72..ee98c9f8d 100644 --- a/en/appendix/files.xml +++ b/en/appendix/files.xml @@ -193,16 +193,31 @@ when your mouse only has one button. Just add the following lines to clear the slate, quit aptitude and repeat for other tasks. Space requirements need to be determined from tasksel as tasksel will not install recommended packages while selecting a task from aptitude will. + + The size for the minimal base system should be determined after running + 'aptitude clean' using 'du -hsx /'. After that the "Standard system" task + should be installed after which the size of the standard system should be + determined using the same method. --> <para> -The base installation for i386 using the default 2.6 kernel, -including all standard packages, requires 585MB of disk space. -A minimal base installation, without the standard task selected, -will take 365MB. +A standard installation for the i386 architecture, including all standard +packages and using the default 2.6 kernel, takes up 442MB of disk space. +A minimal base installation, without the <quote>Standard system</quote> +task selected, will take 230MB. -</para><para> +</para> +<important><para> + +In both cases this is the actual disk space used <emphasis>after</emphasis> +the installation is finished and any temporary files deleted. It also does +not take into account overhead used by the file system, for example for +journal files. This means that significantly more disk space is needed both +<emphasis>during</emphasis> the installation and for normal system use. + +</para></important> +<para> The following table lists sizes reported by aptitude for the tasks listed in tasksel. Note that some tasks have overlapping constituents, so the @@ -212,9 +227,10 @@ obtained by adding up the numbers. </para><para> Note that you will need to add the sizes listed in the table to the size -of the base installation when determining the size of partitions. +of the standard installation when determining the size of partitions. Most of the size listed as <quote>Installed size</quote> will end up in -<filename>/usr</filename>; the size listed as <quote>Download size</quote> +<filename>/usr</filename> and in <filename>/lib</filename>; +the size listed as <quote>Download size</quote> is (temporarily) required in <filename>/var</filename>. </para><para> @@ -231,17 +247,25 @@ is (temporarily) required in <filename>/var</filename>. <tbody> <row> - <entry>Desktop</entry> - <entry>1258</entry> - <entry>418</entry> - <entry>1676</entry> + <entry>Desktop environment</entry> + <entry>1267</entry> + <entry>420</entry> + <entry>1667</entry> </row> <row> - <entry>Laptop</entry> - <entry>46</entry> - <entry>16</entry> - <entry>62</entry> + <entry>Laptop<footnote> + + <para> + There is a large overlap of the Laptop task with the Destop environment task. + If you install both, the Laptop task will only require a few MB additional + disk space. + </para> + + </footnote></entry> + <entry>50</entry> + <entry>17</entry> + <entry>67</entry> </row> <row> @@ -253,9 +277,9 @@ is (temporarily) required in <filename>/var</filename>. <row> <entry>Print server</entry> - <entry>326</entry> - <entry>95</entry> - <entry>421</entry> + <entry>277</entry> + <entry>79</entry> + <entry>356</entry> </row> <row> @@ -267,9 +291,9 @@ is (temporarily) required in <filename>/var</filename>. <row> <entry>File server</entry> - <entry>50</entry> + <entry>49</entry> <entry>21</entry> - <entry>71</entry> + <entry>70</entry> </row> <row> diff --git a/en/hardware/memory-disk-requirements.xml b/en/hardware/memory-disk-requirements.xml index 5c2428471..930778552 100644 --- a/en/hardware/memory-disk-requirements.xml +++ b/en/hardware/memory-disk-requirements.xml @@ -7,11 +7,8 @@ <para> You must have at least &minimum-memory; of memory and &minimum-fs-size; of hard disk -space. For a minimal console-based system (all standard packages), -250MB is required. If you want to install a reasonable amount of -software, including the X Window System, and some development programs -and libraries, you'll need at least 400MB. For a more or less complete -desktop system, you'll need a few gigabytes. +space. Note that these are really bare-minimum numbers. For more realistic +figures, see <xref linkend="minimum-hardware-reqts"/>. </para><para arch="m68k"> diff --git a/en/preparing/minimum-hardware-reqts.xml b/en/preparing/minimum-hardware-reqts.xml index 0def42ddb..d02db8ac9 100644 --- a/en/preparing/minimum-hardware-reqts.xml +++ b/en/preparing/minimum-hardware-reqts.xml @@ -17,8 +17,8 @@ risk being frustrated if they ignore these suggestions. </para><para arch="x86"> -A Pentium 100 is the minimum recommended for desktop -systems, and a Pentium II-300 for a Server. +A Pentium 4, 1GHz system is the minimum recommended for a desktop +systems. </para><para arch="m68k"> @@ -27,107 +27,82 @@ installs. You may get by with a little less drive space than shown. </para><para arch="powerpc"> -Any OldWorld or NewWorld PowerPC can serve well -as a Desktop System. For servers, a minimum 132-Mhz machine is -recommended. +Any OldWorld or NewWorld PowerPC can serve well as a desktop system. </para> <table> <title>Recommended Minimum System Requirements</title> -<tgroup cols="3"> +<tgroup cols="4"> <thead> <row> - <entry>Install Type</entry><entry>RAM</entry><entry>Hard Drive</entry> + <entry>Install Type</entry> + <entry>RAM (minimal)</entry> + <entry>RAM (recommended)</entry> + <entry>Hard Drive</entry> </row> </thead> <tbody> <row> <entry>No desktop</entry> - <entry>24 megabytes</entry> - <entry>450 megabytes</entry> -</row><row> - <entry>With Desktop</entry> <entry>64 megabytes</entry> + <entry>256 megabytes</entry> <entry>1 gigabyte</entry> -</row><row> - <entry>Server</entry> - <entry>128 megabytes</entry> - <entry>4 gigabytes</entry> +</row><row arch="not-s390"> + <entry>With Desktop</entry> + <entry>64 megabytes</entry> + <entry>512 megabytes</entry> + <entry>5 gigabyte</entry> </row> </tbody></tgroup></table> <para> -Here is a sampling of some common Debian system configurations. -You can also get an idea of the disk space used by related groups -of programs by referring to <xref linkend="tasksel-size-list"/>. - -</para> -<variablelist> - -<varlistentry> - <term>Standard Server</term> - <listitem><para> - -This is a small server profile, useful for a stripped down server -which does not have a lot of niceties for shell users. It includes an -FTP server, a web server, DNS, NIS, and POP. For these 100MB of disk -space would suffice, and then you would need to add space -for any data you serve up. - -</para></listitem> -</varlistentry> +The actual minimum memory requirements are a lot less then the numbers +listed in this table. Depending on the architecture, it is possible to +install Debian with as little as 20MB (for s390) to 48MB (for i386 and +amd64). The same goes for the disk space requirements, especially if you +pick and choose which applications to install; see +<xref linkend="tasksel-size-list"/> for additional information on disk +space requirements. -<varlistentry arch="not-s390"> - <term>Desktop</term> - <listitem><para> - -A standard desktop box, including the X window system, full desktop -environments, sound, editors, etc. You'll need about 2GB using the -standard desktop task, though it can be done in far less. - -</para></listitem> -</varlistentry> - -<varlistentry arch="not-s390"> - <term>Work Console</term> - <listitem><para> - -A more stripped-down user machine, without the X window system or X -applications. Possibly suitable for a laptop or mobile computer. The -size is around 140MB. - -</para></listitem> -</varlistentry> +</para><para arch="not-s390"> -<varlistentry> - <term>Developer</term> - <listitem><para> +It is possible to run a graphical desktop environment on older or +low-end systems, but in that case it is recommended to install +a window manager that is less resource-hungry than those of the +GNOME or KDE desktop environments; alternatives include +<classname>icewm</classname> and <classname>wmaker</classname>, +but there are others to choose from. -A desktop setup with all the development packages, such as Perl, C, -C++, etc. Size is around 475MB. Assuming you are adding X11 and some -additional packages for other uses, you should plan around 800MB for -this type of machine. +</para><para> -</para></listitem> -</varlistentry> +It is practically impossible to give general memory or disk space +requirements for server installations as those very much depend on +what the server is to be used for. -</variablelist><para> +</para><para> Remember that these sizes don't include all the other materials which are usually to be found, such as user files, mail, and data. It is always best to be generous when considering the space for your own -files and data. Notably, the <filename>/var</filename> partition contains +files and data. + +</para><para> + +Disk space required for the smooth operation of the &debian; system +itself is taken into account in these recommended system requirements. +Notably, the <filename>/var</filename> partition contains a lot of state information specific to Debian in addition to its regular -contents like logfiles. The +contents, like logfiles. The <command>dpkg</command> files (with information on all installed -packages) can easily consume 20MB. Also, +packages) can easily consume 40MB. Also, <command>apt-get</command> puts downloaded packages here before they are installed. You should -usually allocate at least 100MB for <filename>/var</filename>. +usually allocate at least 200MB for <filename>/var</filename>, and a lot +more if you install a graphical desktop environment. </para> |