summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nl/appendix/preseed.xml11
-rw-r--r--nl/boot-installer/powerpc.xml32
-rw-r--r--nl/boot-installer/trouble.xml4
-rw-r--r--nl/install-methods/install-tftp.xml43
-rw-r--r--nl/preparing/bios-setup/powerpc.xml9
5 files changed, 69 insertions, 30 deletions
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index c470c439b..59faa0eb8 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 53120 untranslated -->
+<!-- original version: 54252 untranslated -->
<!--
Be careful with the format of this file as it is parsed to generate
@@ -925,10 +925,8 @@ correct one will be selected before using preseeding.
# 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.
+# Note: A disk must be specified, unless the system has only one disk.
+#d-i partman-auto/disk string /dev/sda
# 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
@@ -1262,6 +1260,9 @@ to be used easily on the kernel command line as well.
# Individual additional packages to install
#d-i pkgsel/include string openssh-server build-essential
+# Whether to upgrade packages after debootstrap.
+# Allowed values: none, safe-upgrade, full-upgrade
+#d-i pkgsel/upgrade select none
# Some versions of the installer can report back on what software you have
# installed, and what software you use. The default is not to report back,
diff --git a/nl/boot-installer/powerpc.xml b/nl/boot-installer/powerpc.xml
index 2a5dc6105..f18e4b809 100644
--- a/nl/boot-installer/powerpc.xml
+++ b/nl/boot-installer/powerpc.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43923 untranslated -->
+<!-- original version: 54017 untranslated -->
<sect2 arch="powerpc" id="boot-cd"><title>Booting from a CD-ROM</title>
@@ -79,10 +79,7 @@ You will have already placed the <filename>vmlinux</filename>,
<filename>initrd.gz</filename>, <filename>yaboot</filename>, and
<filename>yaboot.conf</filename> files at the root level of your HFS
partition in <xref linkend="files-newworld"/>.
-Restart the computer, and immediately (during the chime) hold down the
-<keycap>Option</keycap>, <keycap>Command (cloverleaf/Apple)</keycap>,
-<keycap>o</keycap>, and <keycap>f</keycap> keys all together. After
-a few seconds you will be presented with the Open Firmware prompt.
+You will now have to boot into OpenFirmware (see <xref linkend="invoking-openfirmware"/>).
At the prompt, type
<informalexample><screen>
@@ -126,10 +123,7 @@ linkend="boot-usb-files"/>. To boot a Macintosh system from a USB stick,
you will need to use the Open Firmware prompt, since Open Firmware does
not search USB storage devices by default.
<!-- TODO: although it could be made to; watch this space -->
-To get to the prompt, hold down
-<keycombo><keycap>Command</keycap> <keycap>Option</keycap>
-<keycap>o</keycap> <keycap>f</keycap></keycombo> all together while
-booting (see <xref linkend="invoking-openfirmware"/>).
+See <xref linkend="invoking-openfirmware"/>.
</para><para>
@@ -186,10 +180,26 @@ Currently, PReP and New World PowerMac systems support netbooting.
On machines with Open Firmware, such as NewWorld Power Macs, enter the
boot monitor (see <xref linkend="invoking-openfirmware"/>) and
-use the command <command>boot enet:0</command>. PReP and CHRP boxes
+use the command
+
+<informalexample><screen>
+0 &gt; boot enet:0
+</screen></informalexample>
+
+If this doesn't work, you might have to add the filename like this:
+
+<informalexample><screen>
+0 &gt; boot enet:0,yaboot
+</screen></informalexample>
+
+PReP and CHRP boxes
may have different ways of addressing the network. On a PReP machine,
you should try
-<userinput>boot net:<replaceable>server_ipaddr</replaceable>,<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable></userinput>.
+
+<informalexample><screen>
+boot net:<replaceable>server_ipaddr</replaceable>,<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable>
+</screen></informalexample>
+
On some PReP systems (e.g. Motorola PowerStack machines) the command
<userinput>help boot</userinput> may give a description of syntax and
available options.
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index 62df47a1a..2688bf46f 100644
--- a/nl/boot-installer/trouble.xml
+++ b/nl/boot-installer/trouble.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46505 untranslated -->
+<!-- original version: 53732 untranslated -->
<sect1 id="boot-troubleshooting">
<title>Troubleshooting the Installation Process</title>
@@ -520,7 +520,7 @@ Processor:
Memory:
Partitions: &lt;df -Tl will do; the raw partition table is preferred&gt;
-Output of lspci -nn and lspci -vnn:
+Output of lspci -knn (or lspci -nn):
Base System Installation Checklist:
[O] = OK, [E] = Error (please elaborate below), [ ] = didn't try it
diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml
index 562fd4fdf..a1dd58cef 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: 53452 untranslated -->
+<!-- original version: 54017 untranslated -->
<sect1 condition="supports-tftp" id="install-tftp">
<title>Preparing Files for TFTP Net Booting</title>
@@ -119,9 +119,11 @@ Look in <filename>/etc/inetd.conf</filename> and remember the directory which
is used as the argument of <command>in.tftpd</command><footnote>
<para>
-The <userinput>-l</userinput> argument enables some versions of
-<command>in.tftpd</command> to log all requests to the system logs;
-this is useful for diagnosing boot errors.
+All <command>in.tftpd</command> alternatives available in Debian should
+log TFTP requests to the system logs by default. Some of them support a
+<userinput>-v</userinput> argument to increase verbosity.
+It is recommended to check these log messages in case of boot problems
+as they are a good starting point for diagnosing the cause of errors.
</para>
</footnote>; you'll need that below.
@@ -172,9 +174,36 @@ TFTP client, and there are no strong standards.
On NewWorld Power Macintosh machines, you will need to set up the
<command>yaboot</command> boot loader as the TFTP boot image.
<command>Yaboot</command> will then retrieve the kernel and RAMdisk
-images via TFTP itself. For net booting, use the
-<filename>yaboot-netboot.conf</filename>. Just rename this to
-<filename>yaboot.conf</filename> in the TFTP directory.
+images via TFTP itself. You will need to download the following files
+from the <filename>netboot/</filename> directory:
+
+<itemizedlist>
+<listitem><para>
+
+<filename>vmlinux</filename>
+
+</para></listitem>
+<listitem><para>
+
+<filename>initrd.gz</filename>
+
+</para></listitem>
+<listitem><para>
+
+<filename>yaboot</filename>
+
+</para></listitem>
+<listitem><para>
+
+<filename>yaboot.conf</filename>
+
+</para></listitem>
+<listitem><para>
+
+<filename>boot.msg</filename>
+
+</para></listitem>
+</itemizedlist>
</para><para arch="x86">
diff --git a/nl/preparing/bios-setup/powerpc.xml b/nl/preparing/bios-setup/powerpc.xml
index 12158ee07..2725ca64a 100644
--- a/nl/preparing/bios-setup/powerpc.xml
+++ b/nl/preparing/bios-setup/powerpc.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46722 untranslated -->
+<!-- original version: 54285 untranslated -->
<sect2 arch="powerpc" id="invoking-openfirmware">
@@ -15,10 +15,9 @@ documentation which came with your machine.
</para><para>
On &arch-title; Macintoshes, you invoke OpenFirmware with
-<keycombo><keycap>Command</keycap> <keycap>option</keycap>
-<keycap>O</keycap> <keycap>F</keycap></keycombo> while booting. Generally it
-will check for these keystrokes after the chime, but the exact timing
-varies from model to model. See
+<keycombo><keycap>Command (cloverleaf/Apple)</keycap><keycap>Option</keycap><keycap>o</keycap><keycap>f</keycap></keycombo>
+while booting. Generally it will check for these keystrokes after the
+chime, but the exact timing varies from model to model. See
<ulink url="&url-netbsd-powerpc-faq;"></ulink> for more hints.
</para><para>