summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2007-07-23 15:20:32 +0000
committerFrans Pop <elendil@planet.nl>2007-07-23 15:20:32 +0000
commitd5bc70d35b186481818a202db6037b5e57af13c0 (patch)
tree111c5f34086fa8558c191e5e885b40b8fa7feac0 /en
parent56982edc107113b5770cf6104b6c3d5853f32594 (diff)
downloadinstallation-guide-d5bc70d35b186481818a202db6037b5e57af13c0.zip
Keep old text for now so we can still build the manual for Etch too
Diffstat (limited to 'en')
-rw-r--r--en/appendix/preseed.xml6
-rw-r--r--en/using-d-i/modules/x86/lilo-installer.xml6
2 files changed, 10 insertions, 2 deletions
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index f7a3ef4a3..9cab1191b 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -886,10 +886,14 @@ 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
+d-i partman-auto/disk string /dev/sda</phrase>
# 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
diff --git a/en/using-d-i/modules/x86/lilo-installer.xml b/en/using-d-i/modules/x86/lilo-installer.xml
index 730b162a7..b2a1250f4 100644
--- a/en/using-d-i/modules/x86/lilo-installer.xml
+++ b/en/using-d-i/modules/x86/lilo-installer.xml
@@ -49,7 +49,11 @@ 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 traditional device names such as
+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
<filename>/dev/hda</filename> or <filename>/dev/sda</filename>.
</para></listitem></varlistentry>