From 782910514094036f72038a901167efaa53fbfc5e Mon Sep 17 00:00:00 2001 From: Joachim Wiedorn Date: Sun, 20 Mar 2011 15:41:42 +0100 Subject: [PATCH] Fix typos and phrases in manpage of lilo.conf Update of the configuration example. More clearness about the both ways of configuration of background bitmaps. Remove of all information about OS/2 as alternate system, because OS/2 is obsolete for many years. --- debian/changelog | 5 +- .../15_fix-typos-in-manpage-lilo-conf.patch | 140 ++++++++++++++++++ debian/patches/series | 1 + debian/patches/ubuntu.series | 1 + 4 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 debian/patches/15_fix-typos-in-manpage-lilo-conf.patch diff --git a/debian/changelog b/debian/changelog index cc2a6d5..a086665 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -lilo (1:23.1-2) unstable; urgency=low +lilo (1:23.1-2) unstable; urgency=medium * debian/control: - Remove dependency to lilo in package lilo-doc. (Closes: #613753) @@ -29,8 +29,9 @@ lilo (1:23.1-2) unstable; urgency=low * Add new script liloconfig, using template with comments, works with UUID, LABEL and disk-id for root and boot options. * Add new manpage for liloconfig, update of other manpages. + * Fix typos and phrases in manpage of lilo.conf. (Closes: #258472) - -- Joachim Wiedorn Sun, 20 Mar 2011 00:15:54 +0100 + -- Joachim Wiedorn Sun, 20 Mar 2011 14:37:18 +0100 lilo (1:23.1-1) unstable; urgency=low diff --git a/debian/patches/15_fix-typos-in-manpage-lilo-conf.patch b/debian/patches/15_fix-typos-in-manpage-lilo-conf.patch new file mode 100644 index 0000000..e83c703 --- /dev/null +++ b/debian/patches/15_fix-typos-in-manpage-lilo-conf.patch @@ -0,0 +1,140 @@ +Package: lilo +Subject: fix typos in manpage lilo conf +Author: Joachim Wiedorn +Forwarded: yes +Last-Update: 2011-03-20 + +Update of the configuration example. More clearness about the +both ways of configuration of background bitmaps. Remove of +all information about OS/2 as alternate system, because OS/2 +is obsolete for many years. +--- + +diff -urN s14/man/lilo.conf.5 s15/man/lilo.conf.5 +--- s14/man/lilo.conf.5 2010-11-01 17:13:41.000000000 +0100 ++++ s15/man/lilo.conf.5 2011-03-20 14:18:06.116170451 +0100 +@@ -28,9 +28,9 @@ + It might look as follows: + .IP + .nf +-# lilo.conf ++# /etc/lilo.conf + # +-# global options: ++### global options ### + boot=/dev/hda + prompt + timeout=150 +@@ -41,28 +41,24 @@ + read-only + menu-title=" John's Computer " + # +-# bootable kernel images: +-image=/boot/zImage-1.5.99 ++### bootable kernel images ### ++image=/boot/vmlinuz-2.6.20-1-i386 + label=try +-image=/boot/zImage-1.0.9 +- label=1.0.9 ++image=/boot/vmlinuz-2.4.33-1-i386 ++ label=2.4.33 + image=/tamu/vmlinuz + label=tamu +- initrd=initramdisk.img ++ initrd=/tamu/initrd.img + root=/dev/hdb2 + vga=ask + # +-# other operating systems: ++### other operating systems ### + other=/dev/hda3 +- label=dos ++ label=DOS + boot-as=0x80 # must be C: + other=/dev/hdb1 +- label=Win98 ++ label=WinXP + boot-as=0x80 # must be C: +-other=/dev/hdb5 +- label=os2 +- loader=os2_d +- table=E: # os2 sees as E: + .fi + .LP + This configuration file specifies that lilo uses the Master +@@ -130,17 +126,19 @@ + .sp + When a bitmap file is specified as a background screen during the boot + process, the color selection and layout of the text which overlays the +-graphic image must be specified in one of two ways. One way, is to use +-a bitmap image (*.bmp) file which has had a header written by the ++graphic image must be specified in one of two ways. ++.sp ++One way is the use of header information in the bitmap image (*.bmp) file: ++From a text file with all the information about 'bmp-colors', 'bmp-table' ++and 'bmp-timer' options together with the 'bitmap' option are stored in ++the special LILO header of the bitmap image file by the + .BI "lilo -E" +-command. If this command is used, then all of the +-information specified by the 'bmp-colors', 'bmp-table', and 'bmp-timer' +-options is stored in a special LILO header within the bitmap file. +-Without this header, the 'bmp-' option values should be +-specified in the configuration file; if not, default values are used. +-Any use of the 'bmp-' options +-within the configuration file overrides the values stored in the +-bitmap file header. ++command. Another way works without these special header information: All ++the information about 'bmp-colors', 'bmp-table' and 'bmp-timer' options ++together with the 'bitmap' option are stored in the configuration file. ++Any use of the 'bmp-' options within the configuration file overrides ++the options stored in the bitmap file header. If lilo cannot find any of ++the 'bmp-' options, then default values are used. + .TP + .BI "bmp-colors=" ,,,,, + Specifies the decimal values of the colors to be used for the menu display +@@ -292,9 +290,9 @@ + .fi + .sp + probably only useful for floppy disks and loopback devices, +-since for hard disks the ++because for hard disks the + .BI lba32 +-disk addressing option (LILO 21.2) ignores disk geometry. ++disk addressing option ignores disk geometry. + .sp + (22.5.8) Developers who have implemented a disk driver for a new block storage + device will have to indicate to LILO the maximum number of partitions +@@ -836,14 +834,8 @@ + By default + .I chain + is used. This chain loader passes partition and drive information in the +-boot sector it loads only to DOS on FAT12 or FAT16, Windows on FAT16 or +-FAT32, or OS/2 on FAT16 or HPFS. +-The alternate chain loader, +-.I os2_d +-passes partition and drive information unconditionally, and uses a format +-suitable for OS/2 and DOS (see +-.I table= +-below). ++boot sector it loads only to DOS on FAT12 or FAT16, or Windows on FAT16 or ++FAT32. + .TP + .BI "table=" + This specifies the device that contains the partition table. +@@ -856,14 +848,9 @@ + with `table' is modified. + .TP + .BI "table=" +-This is a special case for the ++This option is obsolete. It were used in the special case for the + .I os2_d +-chain loader. It specifies the DOS drive letter for the partition +-that will be booted. This is +-.I mandatory +-when booting OS/2 installed on +-an extended partition. The drive letter may be specified with or without a +-trailing colon. ++chain loader. + .TP + .BI "change" + This keyword starts a section which describes how primary partition IDs are diff --git a/debian/patches/series b/debian/patches/series index f7af3af..94aec46 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ 12_save-errno-for-second-command.patch 13_reformatted-mkrescue-manpage.patch 14_fix-missleading-error-message.patch +15_fix-typos-in-manpage-lilo-conf.patch diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series index a575cef..d0ab301 100644 --- a/debian/patches/ubuntu.series +++ b/debian/patches/ubuntu.series @@ -12,3 +12,4 @@ 12_save-errno-for-second-command.patch 13_reformatted-mkrescue-manpage.patch 14_fix-missleading-error-message.patch +15_fix-typos-in-manpage-lilo-conf.patch -- 2.39.2