diff options
-rw-r--r-- | nl/appendix/chroot-install.xml | 43 | ||||
-rw-r--r-- | nl/boot-installer/parameters.xml | 10 | ||||
-rw-r--r-- | nl/boot-installer/x86.xml | 4 | ||||
-rw-r--r-- | nl/install-methods/install-tftp.xml | 4 |
4 files changed, 33 insertions, 28 deletions
diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml index 51bf826d3..7d1e0d8fb 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: 43841 untranslated --> +<!-- original version: 44001 untranslated --> <sect1 id="linux-upgrade"> <title>Installing &debian; from a Unix/Linux System</title> @@ -343,10 +343,10 @@ Enter your nameserver(s) and search directives in # editor /etc/resolv.conf </screen></informalexample> -A simple <filename>/etc/resolv.conf</filename>: +A simple example <filename>/etc/resolv.conf</filename>: <informalexample><screen> -search hqdom.local\000 +search hqdom.local nameserver 10.1.1.36 nameserver 192.168.9.100 </screen></informalexample> @@ -465,21 +465,6 @@ its man page which will be available after installing the <classname>kernel-package</classname> package. We recommend that you check that the values are appropriate for your system. -</para><para arch="x86"> - -If you intend to use <classname>grub</classname> as your bootloader, you -can set the <literal>do_bootloader</literal> option to <quote>no</quote>. -To automatically update your <filename>/boot/grub/menu.lst</filename> on -installation or removal of Debian kernels, add the following lines: - -<informalexample><screen> -postinst_hook = update-grub -postrm_hook = update-grub -</screen></informalexample> - -For the <classname>lilo</classname> bootloader, the value of -<literal>do_bootloader</literal> needs to be <quote>yes</quote>. - </para><para> Then install the kernel package of your choice using its package name. @@ -522,7 +507,7 @@ Installing and setting up <classname>grub</classname> is as easy as: <informalexample><screen> # aptitude install grub -# grub-install /dev/<replaceable>hda</replaceable> +# grub-install --recheck --no-floppy /dev/<replaceable>hda</replaceable> # update-grub </screen></informalexample> @@ -544,6 +529,26 @@ image=/vmlinuz label=Debian </screen></informalexample> +</para><para arch="x86"> + +Depending on which bootloader you selected, you can now make some +additional changes in <filename>/etc/kernel-img.conf</filename>. + +</para><para arch="x86"> + +For the <classname>grub</classname> bootloader, you should +set the <literal>do_bootloader</literal> option to <quote>no</quote>. +And to automatically update your <filename>/boot/grub/menu.lst</filename> +on installation or removal of Debian kernels, add the following lines: + +<informalexample><screen> +postinst_hook = update-grub +postrm_hook = update-grub +</screen></informalexample> + +For the <classname>lilo</classname> bootloader, the value of +<literal>do_bootloader</literal> needs to remain <quote>yes</quote>. + </para><para arch="powerpc"> Check <userinput>man yaboot.conf</userinput> for instructions on diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml index 1259462c8..838d9c9c1 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: 43912 untranslated --> +<!-- original version: 44002 untranslated --> <sect1 id="boot-parms"><title>Boot Parameters</title> <para> @@ -139,9 +139,9 @@ installer. The current possible parameter settings are: The default frontend is <userinput>DEBIAN_FRONTEND=newt</userinput>. <userinput>DEBIAN_FRONTEND=text</userinput> may be preferable for -serial console installs. Generally only the +serial console installs. Generally, only the <userinput>newt</userinput> frontend is available on default install -media. On architectures which support it, the graphical installer uses +media. On architectures that support it, the graphical installer uses the <userinput>gtk</userinput> frontend. </para></listitem> @@ -300,7 +300,7 @@ this misbehavior. <term>preseed/url (url)</term> <listitem><para> -Specify the url to a preconfiguration file to download and use in +Specify the url to a preconfiguration file to download and use for automating the install. See <xref linkend="automatic-install"/>. </para></listitem> @@ -310,7 +310,7 @@ automating the install. See <xref linkend="automatic-install"/>. <term>preseed/file (file)</term> <listitem><para> -Specify the path to a preconfiguration file to load to +Specify the path to a preconfiguration file to load for automating the install. See <xref linkend="automatic-install"/>. </para></listitem> diff --git a/nl/boot-installer/x86.xml b/nl/boot-installer/x86.xml index 96edd60f4..7908e917e 100644 --- a/nl/boot-installer/x86.xml +++ b/nl/boot-installer/x86.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 43730 untranslated --> +<!-- original version: 44002 untranslated --> <sect2 arch="x86"><title>Booting from a CD-ROM</title> @@ -281,7 +281,7 @@ There are various ways to do a TFTP boot on i386. It could be that your Network Interface Card or Motherboard provides PXE boot functionality. This is a <trademark class="trade">Intel</trademark> re-implementation -of TFTP boot. If so you may be able to configure your BIOS to boot from the +of TFTP boot. If so, you may be able to configure your BIOS to boot from the network. </para> diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml index 679a92076..ea269ee5e 100644 --- a/nl/install-methods/install-tftp.xml +++ b/nl/install-methods/install-tftp.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 43696 untranslated --> +<!-- original version: 44002 untranslated --> <sect1 condition="supports-tftp" id="install-tftp"> <title>Preparing Files for TFTP Net Booting</title> @@ -105,7 +105,7 @@ are installed. </para> <note><para> -Historically TFTP servers used <filename>/tftpboot</filename> as directory +Historically, TFTP servers used <filename>/tftpboot</filename> as directory to serve images from. However, &debian; packages may use other directories to comply with the <ulink url="&url-fhs-home;">Filesystem Hierarchy Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default |