diff options
| -rw-r--r-- | nl/appendix/chroot-install.xml | 65 | ||||
| -rw-r--r-- | nl/appendix/graphical.xml | 12 | ||||
| -rw-r--r-- | nl/appendix/preseed.xml | 40 | ||||
| -rw-r--r-- | nl/boot-installer/parameters.xml | 6 | ||||
| -rw-r--r-- | nl/hardware/hardware-supported.xml | 22 | ||||
| -rw-r--r-- | nl/hardware/installation-media.xml | 3 | ||||
| -rw-r--r-- | nl/hardware/supported/arm.xml | 19 | ||||
| -rw-r--r-- | nl/hardware/supported/sparc.xml | 37 | ||||
| -rw-r--r-- | nl/install-methods/download/arm.xml | 15 | ||||
| -rw-r--r-- | nl/using-d-i/modules/x86/lilo-installer.xml | 8 |
10 files changed, 100 insertions, 127 deletions
diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml index 97f9ca09b..9af7cdb2b 100644 --- a/nl/appendix/chroot-install.xml +++ b/nl/appendix/chroot-install.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 44410 untranslated --> +<!-- original version: 49850 untranslated --> <sect1 id="linux-upgrade"> <title>Installing &debian; from a Unix/Linux System</title> @@ -27,6 +27,19 @@ media. </para> +<note><para> + +As this is a mostly manual procedure, you should bear in mind that you +will need to do a lot of basic configuration of the system yourself, +which will also require more knowledge of Debian and of Linux in general +than performing a regular installation. You cannot expect this procedure +to result in a system that is identical to a system from a regular +installation. You should also keep in mind that this procedure only +gives the basic steps to set up a system. Additional installation and/or +configuration steps may be needed. + +</para></note> + <sect2> <title>Getting Started</title> <para> @@ -203,6 +216,49 @@ compatible with the Debian base system, for example: </para> <sect3> + <title>Create device files</title> +<para> + +At this point <filename>/dev/</filename> only contains very basic device +files. For the next steps of the installation additional device files may +be needed. There are different ways to go about this and which method you +should use depends on the host system you are using for the installation, +on whether you intend to use a modular kernel or not, and on whether you +intend to use dynamic (e.g. using <classname>udev</classname>) or static +device files for the new system. + +</para><para> + +A few of the available options are: + +<itemizedlist> +<listitem><para> + +create a default set of static device files using +<informalexample><screen> +# cd /dev +# MAKEDEV generic +</screen></informalexample> + +</para></listitem> +<listitem><para> + +manually create only specific device files using <command>MAKEDEV</command> + +</para></listitem> +<listitem><para> + +bind mount /dev from your host system on top of /dev in the target system; +note that the postinst scripts of some packages may try to create device +files, so this option should only be used with care + +</para></listitem> +</itemizedlist> + +</para> + </sect3> + + <sect3> <title>Mount Partitions</title> <para> @@ -515,6 +571,12 @@ The second command will install <command>grub</command> (in this case in the MBR of <literal>hda</literal>). The last command will create a sane and working <filename>/boot/grub/menu.lst</filename>. +</para><para> + +Note that this assumes that a <filename>/dev/hda</filename> device file has +been created. There are alternative methods to install <command>grub</command>, +but those are outside the scope of this appendix. + </para><para arch="x86"> Here is a basic <filename>/etc/lilo.conf</filename> as an example: @@ -526,6 +588,7 @@ install=menu delay=20 lba32 image=/vmlinuz +initrd=/initrd.img label=Debian </screen></informalexample> diff --git a/nl/appendix/graphical.xml b/nl/appendix/graphical.xml index a6d704ad9..54afa85ff 100644 --- a/nl/appendix/graphical.xml +++ b/nl/appendix/graphical.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 48015 untranslated --> +<!-- original version: 49849 untranslated --> <sect1 condition="gtk" id="graphical"> <title>The Graphical Installer</title> @@ -37,9 +37,8 @@ image<footnote id="gtk-miniiso"> <para> The mini ISO image can be downloaded from a Debian mirror as described -in <xref linkend="downloading-files"/>. Look for -<phrase condition="etch"><filename>gtk-miniiso</filename></phrase> -<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>. +in <xref linkend="downloading-files"/>. +Look for <filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, which is mainly useful for testing; in this case the image is @@ -53,9 +52,8 @@ image is available<footnote id="gtk-miniiso"> <para> The mini ISO image can be downloaded from a Debian mirror as described -in <xref linkend="downloading-files"/>. Look for -<phrase condition="etch"><filename>gtk-miniiso</filename></phrase> -<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>. +in <xref linkend="downloading-files"/>. +Look for <filename>netboot/gtk/mini.iso</filename>. </para> </footnote>. It should work on almost all PowerPC systems that have diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml index e39ba99f1..882d8fb6c 100644 --- a/nl/appendix/preseed.xml +++ b/nl/appendix/preseed.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 49321 untranslated --> +<!-- original version: 49849 untranslated --> <!-- Be careful with the format of this file as it is parsed to generate @@ -844,9 +844,8 @@ same as <classname>mirror/suite</classname>. <informalexample role="example"><screen> # If you select ftp, the mirror/country string does not need to be set. -#d-i mirror/protocol string ftp<phrase condition="etch"> -d-i mirror/country string enter information manually</phrase><phrase condition="lenny"> -d-i mirror/country string manual</phrase> +#d-i mirror/protocol string ftp +d-i mirror/country string manual d-i mirror/http/hostname string &archive-mirror; d-i mirror/http/directory string /debian d-i mirror/http/proxy string @@ -886,17 +885,13 @@ correct one will be selected before using preseeding. #d-i partman-auto/init_automatically_partition \ # select Guided - use the largest continuous free space -<phrase condition="etch"># Alternatively, you can specify a disk to partition. The device name -# can be given in either devfs or traditional non-devfs format. -# For example, to use the first disk: -d-i partman-auto/disk string /dev/discs/disc0/disc</phrase><phrase condition="lenny"> # Alternatively, you can specify a disk to partition. The device name must # be given in traditional non-devfs format. # For example, to use the first SCSI/SATA hard disk: d-i partman-auto/disk string /dev/sda # Note: If you want to use whatever disk is available, no matter # what its device name, comment the line above out. This will only work if -# the system only has one disk.</phrase> +# the system only has one disk. # In addition, you'll need to specify the method to use. # The presently available methods are: "regular", "lvm" and "crypto" d-i partman-auto/method string lvm @@ -1039,13 +1034,12 @@ d-i clock-setup/utc boolean true # You may set this to any valid setting for $TZ; see the contents of # /usr/share/zoneinfo/ for valid values. -d-i time/zone string US/Eastern<phrase condition="lenny"> +d-i time/zone string US/Eastern # Controls whether to use NTP to set the clock during the install d-i clock-setup/ntp boolean true # NTP server to use. The default is almost always fine here. #d-i clock-setup/ntp-server ntp.example.com -</phrase> </screen></informalexample> </sect2> @@ -1091,11 +1085,11 @@ MD5 hash allows for brute force attacks. # or encrypted using an MD5 hash. #d-i passwd/user-password-crypted password [MD5 hash] # Create the first user with the specified UID instead of the default. -#d-i passwd/user-uid string 1010<phrase condition="lenny"> +#d-i passwd/user-uid string 1010 # The user account will be added to some standard initial groups. To # override that, use this. -#d-i passwd/user-default-groups string audio cdrom video</phrase> +#d-i passwd/user-default-groups string audio cdrom video </screen></informalexample> <para> @@ -1130,11 +1124,11 @@ installation. The only questions asked concern the installation of the kernel. <informalexample role="example"><screen> # Select the initramfs generator used to generate the initrd for 2.6 kernels. -#d-i base-installer/kernel/linux/initramfs-generators string yaird<phrase condition="lenny"> +#d-i base-installer/kernel/linux/initramfs-generators string yaird # The kernel image (meta) package to be installed; "none" can be used if no # kernel is to be installed. -#d-i base-installer/kernel/image linux-image-2.6-486</phrase> +#d-i base-installer/kernel/image linux-image-2.6-486 </screen></informalexample> </sect2> @@ -1154,15 +1148,12 @@ earlier questions. You can optionally add other (local) repositories. #d-i apt-setup/non-free boolean true #d-i apt-setup/contrib boolean true # Uncomment this if you don't want to use a network mirror. -#d-i apt-setup/use_mirror boolean false<phrase condition="etch"> -# Uncomment this to avoid adding security sources, or -# add a hostname to use a different server than security.debian.org. -#d-i apt-setup/security_host string</phrase><phrase condition="lenny"> +#d-i apt-setup/use_mirror boolean false # Select which update services to use; define the mirrors to be used. # Values shown below are the normal defaults. #d-i apt-setup/services-select multi-select security, volatile #d-i apt-setup/security_host string security.debian.org -#d-i apt-setup/volatile_host string volatile.debian.org</phrase> +#d-i apt-setup/volatile_host string volatile.debian.org # Additional repositories, local[0-9] available #d-i apt-setup/local0/repository string \ @@ -1245,11 +1236,10 @@ to be used easily on the kernel command line as well. </para> <informalexample role="example"><screen> -#tasksel tasksel/first multiselect standard, web-server<phrase condition="lenny"> +#tasksel tasksel/first multiselect standard, web-server # If the desktop task is selected, install the kde and xfce desktops # instead of the default gnome desktop. -#tasksel tasksel/desktop multiselect kde, xfce</phrase><phrase condition="etch"> -#tasksel tasksel/first multiselect standard, kde-desktop</phrase> +#tasksel tasksel/desktop multiselect kde, xfce # Individual additional packages to install #d-i pkgsel/include string openssh-server build-essential @@ -1269,10 +1259,10 @@ to be used easily on the kernel command line as well. <informalexample role="example"><screen> # Grub is the default boot loader (for x86). If you want lilo installed # instead, uncomment this: -#d-i grub-installer/skip boolean true<phrase condition="lenny"> +#d-i grub-installer/skip boolean true # To also skip installing lilo, and install no bootloader, uncomment this # too: -#d-i lilo-installer/skip boolean true</phrase> +#d-i lilo-installer/skip boolean true # This is fairly safe to set, it makes grub install automatically to the MBR # if no other operating system is detected on the machine. diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml index 40d7d04b8..b3c970ee7 100644 --- a/nl/boot-installer/parameters.xml +++ b/nl/boot-installer/parameters.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 48421 untranslated --> +<!-- original version: 49849 untranslated --> <sect1 id="boot-parms"><title>Boot Parameters</title> <para> @@ -205,7 +205,7 @@ one device. </para></listitem> </varlistentry> -<varlistentry condition="lenny"> +<varlistentry> <term>lowmem</term> <listitem><para> @@ -297,7 +297,7 @@ this misbehavior. </para></listitem> </varlistentry> -<varlistentry condition="lenny"> +<varlistentry> <term>disk-detect/dmraid/enable (dmraid)</term> <listitem><para> diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml index cc713827f..851d110e7 100644 --- a/nl/hardware/hardware-supported.xml +++ b/nl/hardware/hardware-supported.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 48719 untranslated --> +<!-- original version: 49849 untranslated --> <sect1 id="hardware-supported"> <title>Supported Hardware</title> @@ -63,10 +63,8 @@ variations of each architecture known as <quote>flavors</quote>. </row> <row> - <entry morerows="3" condition="etch">ARM and StrongARM</entry> - <entry morerows="2" condition="lenny">ARM and StrongARM</entry> - <entry morerows="3" condition="etch">arm</entry> - <entry morerows="2" condition="lenny">arm</entry> + <entry morerows="2">ARM and StrongARM</entry> + <entry morerows="2">arm</entry> <entry>Netwinder and CATS</entry> <entry>netwinder</entry> </row><row> @@ -75,9 +73,6 @@ variations of each architecture known as <quote>flavors</quote>. </row><row> <entry>Intel IXP4xx</entry> <entry>ixp4xx</entry> -</row><row condition="etch"> - <entry>RiscPC</entry> - <entry>rpc</entry> </row> <row> @@ -164,14 +159,9 @@ variations of each architecture known as <quote>flavors</quote>. <entry>prep</entry> </row> -<row condition="etch"> - <entry morerows="2">Sun SPARC</entry> - <entry morerows="2">sparc</entry> - <entry>sun4m</entry> - <entry>sparc32</entry> -</row><row> - <entry morerows="1" condition="lenny">Sun SPARC</entry> - <entry morerows="1" condition="lenny">sparc</entry> +<row> + <entry morerows="1">Sun SPARC</entry> + <entry morerows="1">sparc</entry> <entry>sun4u</entry> <entry morerows="1">sparc64</entry> </row><row> diff --git a/nl/hardware/installation-media.xml b/nl/hardware/installation-media.xml index a6c247b2c..e62b87ad9 100644 --- a/nl/hardware/installation-media.xml +++ b/nl/hardware/installation-media.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 46426 untranslated --> +<!-- original version: 49849 untranslated --> <sect1 id="installation-media"> <title>Installation Media</title> @@ -77,7 +77,6 @@ console, see the <ulink url="&url-srm-howto;">SRM HOWTO</ulink>. </para><para arch="arm"> IDE/ATAPI CD-ROMs are supported on all ARM machines. -<phrase condition="etch">On RiscPCs, SCSI CD-ROMs are also supported.</phrase> </para><para arch="mips"> diff --git a/nl/hardware/supported/arm.xml b/nl/hardware/supported/arm.xml index 855377d3d..0f6a14596 100644 --- a/nl/hardware/supported/arm.xml +++ b/nl/hardware/supported/arm.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 46426 untranslated --> +<!-- original version: 49849 untranslated --> <sect2 arch="arm"><title>CPU, Main Boards, and Video Support</title> @@ -70,23 +70,6 @@ url="&url-arm-cyrius-nslu2;">installation instructions</ulink>. </para></listitem> </varlistentry> -<varlistentry condition="etch"> -<term>RiscPC</term> -<listitem><para> - -This machine is the oldest supported hardware but support for it in -our new installer is incomplete. -It has RISC OS in ROM, Linux can be booted from that OS using -linloader. The RiscPC has a modular CPU card and typically has a 30MHz -610, 40MHz 710 or 233MHz Strongarm 110 CPU fitted. The mainboard has -integrated IDE, SVGA video, parallel port, single serial port, PS/2 -keyboard and proprietary mouse port. The proprietary module expansion -bus allows for up to eight expansion cards to be fitted depending on -configuration, several of these modules have Linux drivers. - -</para></listitem> -</varlistentry> - </variablelist> </para> diff --git a/nl/hardware/supported/sparc.xml b/nl/hardware/supported/sparc.xml index 21bc832aa..1cd88c0bc 100644 --- a/nl/hardware/supported/sparc.xml +++ b/nl/hardware/supported/sparc.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 48719 untranslated --> +<!-- original version: 49849 untranslated --> <sect2 arch="sparc" id="sparc-cpus"> <title>CPU and Main Boards Support</title> @@ -13,40 +13,7 @@ level of support may be expected for each of them. </para> <variablelist> -<varlistentry condition="etch"> -<term>sun4, sun4c, sun4d</term> - -<listitem><para> - -These subarchitectures include some very old 32-bit machines, which are -no longer supported. For a complete list please consult the -<ulink url="http://en.wikipedia.org/wiki/SPARCstation">Wikipedia -SPARCstation page</ulink>. - -</para></listitem> -</varlistentry> - -<varlistentry condition="etch"> -<term>sun4m</term> - -<listitem><para> - -sun4m is the only 32-bit subarchitecture (sparc32) that is currently -supported. The most popular machines belonging to this class are -Sparcstation 4, 5, 10 and 20. - -</para><para> - -Note that symmetric multiprocessing (SMP) — the ability to run -processes on multiple processors — is not supported on this hardware, -due to stability problems with such configurations. The available -uniprocessor (UP) sparc32 kernel will boot fine on multiprocessor -machines, although it will activate and use only the first CPU. - -</para></listitem> -</varlistentry> - -<varlistentry condition="lenny"> +<varlistentry> <term>sun4, sun4c, sun4d, sun4m</term> <listitem><para> diff --git a/nl/install-methods/download/arm.xml b/nl/install-methods/download/arm.xml index 2439251f7..0890e13ce 100644 --- a/nl/install-methods/download/arm.xml +++ b/nl/install-methods/download/arm.xml @@ -1,20 +1,7 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 46426 untranslated --> +<!-- original version: 49849 untranslated --> - <sect3 arch="arm" condition="etch" id="riscpc-install-files"> - <title>RiscPC Installation Files</title> -<para> - -The RiscPC installer is booted initially from RISC OS. All the -necessary files are provided in one Zip archive, &rpc-install-kit;. -Download this file onto the RISC OS machine, copy the -<filename>linloader.!Boot</filename> components into place, and run -<filename>!dInstall</filename>. - -</para> - </sect3> - <sect3 arch="arm" id="netwinder-install-files"> <title>Netwinder Installation Files</title> <para> diff --git a/nl/using-d-i/modules/x86/lilo-installer.xml b/nl/using-d-i/modules/x86/lilo-installer.xml index c9e07c86f..679221536 100644 --- a/nl/using-d-i/modules/x86/lilo-installer.xml +++ b/nl/using-d-i/modules/x86/lilo-installer.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 48599 untranslated --> +<!-- original version: 49849 untranslated --> <sect3 arch="x86"> <title>Install the <command>LILO</command> Boot Loader @@ -49,11 +49,7 @@ loader. Useful for advanced users who want to install <command>LILO</command> somewhere else. In this case you will be asked for desired -location. You can use -<phrase condition="etch">devfs style names, such as those that start with -<filename>/dev/ide</filename>, <filename>/dev/scsi</filename>, and -<filename>/dev/discs</filename>, as well as traditional names,</phrase> -<phrase condition="lenny">traditional device names</phrase> such as +location. You can use traditional device names such as <filename>/dev/hda</filename> or <filename>/dev/sda</filename>. </para></listitem></varlistentry> |