X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=debian%2Flilo.templates;h=561c7c4f5d4d5286e67ddd9e3ab61110af3cc2ae;hb=a61ee11870aeb090a1cdb244e69826947df61c3a;hp=509bb1d1ca329671843247f24506e7a2e0fb48a9;hpb=e54ace12fd683ce1f41b25ed66641e40b84212b0;p=rrq%2Fmaintain_lilo.git

diff --git a/debian/lilo.templates b/debian/lilo.templates
index 509bb1d..561c7c4 100644
--- a/debian/lilo.templates
+++ b/debian/lilo.templates
@@ -27,24 +27,20 @@ _Description: Deprecated parameters in LILO configuration
 
 Template: lilo/add_large_memory
 Type: boolean
-Default: true
+Default: false
 _Description: Do you want to add the large-memory option?
- By default, LILO loads the initrd file into the first 15MB of memory
- to avoid a BIOS limitation with older systems (earlier than 2001).
+ Usually LILO loads the initrd file into the first 15MB of memory to
+ avoid a BIOS limitation with older systems (earlier than 2001 and
+ few systems until 2004).
  .
- However, with newer kernels the combination of kernel and initrd
- may not fit into the first 15MB of memory and so the system will not
- boot properly. It seems that the boot issues appear when the
- kernel+initrd combination is larger than 8MB.
+ With newer kernels the combination of kernel and initrd may not fit
+ into the first 15MB of memory. LILO compute the needed size of memory
+ and will automatically use the memory above 15MB, too, if there is
+ enough physical memory.
  .
- If this machine has a recent BIOS without the 15MB limitation, you can
- add the 'large-memory' option to /etc/lilo.conf to instruct LILO to use
- more memory for passing the initrd to the kernel. You will need to
- re-run the 'lilo' command to make this option take effect.
- .
- If this machine has an older BIOS, you may need to reduce the size of
- the initrd *before* rebooting. Please see the README.Debian file for
- tips on how to do that.
+ If this machine has a recent BIOS without a 15MB limitation and you
+ want to use memory above 15MB for all kernels, set the 'large-memory'
+ option.
 
 Template: lilo/runme
 Type: boolean
@@ -57,12 +53,14 @@ _Description: Do you want to run /sbin/lilo now?
  some things in that place. If you skip this step, you must run /sbin/lilo
  before reboot your computer or your system may not boot again.
 
-Template: lilo/bad_bitmap
-Type: note
-_Description: Invalid bitmap path
- A deprecated bitmap path entry has been discovered in your LILO configuration 
- file (/etc/lilo.conf). You must upgrade this path in order to run LILO. You 
- can also run liloconfig(8) and get a fresh configuration file.
+Template: lilo/diskid_uuid
+Type: boolean
+Default: false
+_Description: Do you want to convert boot and root options?
+ Until kernel using the newer disk interface 'libata' you need the newer
+ DiskID and/or UUID in your /etc/lilo.conf the for boot and root options.
+ For the most modern systems you should use this conversion and then run
+ '/sbin/lilo'.
 
 Template: liloconfig/maintitle
 Type: title
@@ -96,13 +94,13 @@ Template: liloconfig/lilo_warning
 Type: error
 _Description: WARNING!
  Even if lilo runs successfully, see /usr/share/doc/lilo/INCOMPAT.gz for
- changes in the usage of the ${liloconf} file.  If needed: edit ${liloconf} and
+ changes in the usage of the ${liloconf} file. If needed: edit ${liloconf} and
  rerun '/sbin/lilo -v'
 
 Template: liloconfig/select_bitmap
 Type: select
-Choices: /boot/sarge.bmp, /boot/sid.bmp, /boot/coffee.bmp, /boot/debianlilo.bmp
-Default: /boot/coffee.bmp
+Choices: /boot/tuxlogo.bmp, /boot/inside.bmp, /boot/debian.bmp, /boot/debian-de.bmp, /boot/debianlilo.bmp, /boot/coffee.bmp, /boot/onlyblue.bmp
+Default: /boot/debian.bmp
 _Description: The following is the list of the available bitmaps
 
 Template: liloconfig/lilo_error
@@ -149,7 +147,7 @@ _Description: Booting from hard disk.
  partition active. You'll be asked to perform each of these tasks. You may skip
  any or all of them, and perform them manually later on.
  .
- This will result in Linux being booted by default from the hard disk.  If your
+ This will result in Linux being booted by default from the hard disk. If your
  setup is complicated or unusual you should consider writing your own
  customised ${liloconf}. To do this you should exit this configuration program
  and refer to the comprehensive lilo documentation, which can be found in
@@ -194,4 +192,3 @@ Template: liloconfig/activate_error
 Type: error
 _Description: ERROR!
  activate failed! Your system may not be bootable.
-