From 06d7ce341c18761de8178cdb7e7e4228e7c355df Mon Sep 17 00:00:00 2001 From: Joachim Wiedorn Date: Sun, 19 Jun 2011 00:21:13 +0200 Subject: [PATCH 1/1] Updates lilo.conf.5 manpage --- debian/changelog | 4 +- .../11_update-lilo-conf-manpage1.patch | 114 ++++++++++++++++++ .../12_update-lilo-conf-manpage2.patch | 38 ++++++ debian/patches/13_lilo-conf-append-info.patch | 66 ++++++++++ debian/patches/series | 3 + debian/patches/ubuntu.series | 3 + 6 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 debian/patches/11_update-lilo-conf-manpage1.patch create mode 100644 debian/patches/12_update-lilo-conf-manpage2.patch create mode 100644 debian/patches/13_lilo-conf-append-info.patch diff --git a/debian/changelog b/debian/changelog index ab86d60..875d838 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ lilo (1:23.2-2) unstable; urgency=low - Update Vcs Git and Browser URLs. - Remove old Uploader (not active anymore). * Move to compatibility level 8. + * Update lilo.conf manpage using better explanations. + (Closes: #283281, #368133, #629321) - -- Joachim Wiedorn Sat, 18 Jun 2011 13:24:36 +0200 + -- Joachim Wiedorn Sat, 18 Jun 2011 16:53:53 +0200 lilo (1:23.2-1) unstable; urgency=medium diff --git a/debian/patches/11_update-lilo-conf-manpage1.patch b/debian/patches/11_update-lilo-conf-manpage1.patch new file mode 100644 index 0000000..548001c --- /dev/null +++ b/debian/patches/11_update-lilo-conf-manpage1.patch @@ -0,0 +1,114 @@ +Package: lilo +Subject: update and optimize lilo.conf.5 +Author: Joachim Wiedorn +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629321 +Forwarded: yes +Last-Update: 2011-06-18 + +Update and optimize lilo.conf.5. Remove information about +very old lilo versions. +--- + +diff -urN s10/man/lilo.conf.5 s11/man/lilo.conf.5 +--- s10/man/lilo.conf.5 2011-04-09 16:56:47.000000000 +0200 ++++ s11/man/lilo.conf.5 2011-06-18 16:04:46.916604045 +0200 +@@ -69,22 +69,22 @@ + This configuration file specifies that lilo uses the Master + Boot Record on /dev/hda. (For a discussion of the various ways + to use lilo, and the interaction with other operating systems, +-see user.tex from the lilo documentation.) ++see user.pdf from the lilo documentation.) + .LP + When booting, the boot loader will issue its + .I "boot:" +-prompt and wait for you to enter the label of the kernel (and any options) +-which you wish to boot. At any time you may hit [Tab] to see +-a list of kernel/other labels. ++prompt and wait for you to enter the label of the kernel (and any ++options) which you wish to boot. At any time you may hit [Tab] to ++see a list of kernel/other labels. + Alternately, if the \fBmenu\fP boot loader is installed, + a menu of boot options will be presented for your selection. + The title of this menu is overridden with the menu + title specification in this configuration file. +-If you enter nothing, +-then the default kernel image, the first mentioned, (/boot/zImage-1.5.99) +-will be booted after a timeout of 15 seconds (150 deciseconds). +-There may be at least 16 images mentioned in lilo.conf. (The exact number depends +-upon compilation options.) ++If you enter nothing, then the default kernel image, the first ++mentioned, (in the example /boot/vmlinuz-2.6.29-1-i386) will be ++booted after a timeout of 15 seconds (150 deciseconds). There may ++be at least 16 images mentioned in lilo.conf. (The exact number ++depends upon compilation options.) + .LP + As can be seen above, a configuration file starts with a number + of global options (the top 9 lines in the example), +@@ -95,7 +95,7 @@ + + .SH "GLOBAL OPTIONS" + There are many possible keywords. The description below is +-almost literally from user.tex (just slightly abbreviated). ++almost literally from user.pdf (just slightly abbreviated). + .TP + .BI "backup=" + Specifies the location where a copy of any modified boot sector will be +@@ -119,8 +119,8 @@ + as certain RAID installations may benefit from knowing that the + BIOS is 100% reliable. Its use should be considered experimental. + .sp +-N.B.: This option may not be retained in releases beyond 22.5.1, and +-may be specified on the command line with the '\-Z' switch: yes=1, no=0. ++This option may be specified on the command line with the '\-Z' switch: ++yes=1, no=0. + .TP + .BI "bitmap=" + Specifies use of a 640x480x16 (VGA BIOS) or 640x480x256 (VGA/VESA BIOS) +@@ -138,12 +138,12 @@ + 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. 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. ++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 +@@ -189,9 +189,7 @@ + from (and possibly written to) the device that is currently mounted as root. + .sp + A raid installation is initiated by specifying a RAID1 device as the boot +-device; e.g., "boot=/dev/md0". Note that LILO version 22.0 and later +-operate differently from earlier versions with respect to the actual +-location of the boot records. ++device; e.g., "boot=/dev/md0". + .sp + On newer systems you need an unique ID for the boot device. If the boot + sector should write to a partition you can use its UUID in the same manner +@@ -230,7 +228,7 @@ + are used in a + .I change + section (see below), with the suffixes "_normal" or "_hidden" appended. +-See section "Partition type change rules" of user.tex for more details. ++See section "Partition type change rules" of user.pdf for more details. + .TP + .BI "compact" + Tries to merge read requests for adjacent sectors into a single +@@ -260,7 +258,7 @@ + .TP + .BI "disk=" + Defines non-standard parameters for the specified disk. +-See section "Disk geometry" of user.tex for details. ++See section "Disk geometry" of user.pdf for details. + For versions of LILO prior to 22.5, the `bios=' parameter + is quite useful for specifying how the BIOS has assigned + device codes to your disks. diff --git a/debian/patches/12_update-lilo-conf-manpage2.patch b/debian/patches/12_update-lilo-conf-manpage2.patch new file mode 100644 index 0000000..3a22383 --- /dev/null +++ b/debian/patches/12_update-lilo-conf-manpage2.patch @@ -0,0 +1,38 @@ +Package: lilo +Subject: optimize infos in lilo.conf.5 +Author: Joachim Wiedorn +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=283281 +Forwarded: yes +Last-Update: 2011-06-18 + +Optimize infos about "boot=" and "root=" option in lilo.conf.5. +--- + +diff -urN s11/man/lilo.conf.5 s12/man/lilo.conf.5 +--- s11/man/lilo.conf.5 2011-06-18 16:04:46.916604045 +0200 ++++ s12/man/lilo.conf.5 2011-06-18 16:07:05.112620983 +0200 +@@ -184,9 +184,9 @@ + display entirely. + .TP + .BI "boot=" +-Sets the name of the device (e.g. a hard disk partition) that contains +-the boot sector. If this keyword is omitted, the boot sector is read +-from (and possibly written to) the device that is currently mounted as root. ++Sets the name of the device (e.g. hard disk or partition) that contains ++the boot sector and where the new boot sector should be written to. Notice: ++The boot-device should be the device with the currently mounted root partition. + .sp + A raid installation is initiated by specifying a RAID1 device as the boot + device; e.g., "boot=/dev/md0". +@@ -767,9 +767,8 @@ + is used, the root device is set to the device on which the root file + system is currently mounted. If the root has been changed with \-r , + the respective device is used. If the variable `root' is omitted, +-the root device setting contained in the kernel image is used. +-(And that is set at compile time using the ROOT_DEV variable in +-the kernel Makefile, and can later be changed with the rdev(8) program.) ++the root device setting contained in the running kernel image is used. ++Warning: This can induce to an unbootable system! + .sp + The root filesystem may also be specified by a + .B LABEL= diff --git a/debian/patches/13_lilo-conf-append-info.patch b/debian/patches/13_lilo-conf-append-info.patch new file mode 100644 index 0000000..abde3c0 --- /dev/null +++ b/debian/patches/13_lilo-conf-append-info.patch @@ -0,0 +1,66 @@ +Package: lilo +Subject: add info in lilo.conf.5 about append options +Author: Joachim Wiedorn +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=368133 +Forwarded: yes +Last-Update: 2011-06-18 + +Add some infos for right usage of "append=" and "addappend=" option +in lilo.conf.5. +--- + +diff -urN s12/man/lilo.conf.5 s13/man/lilo.conf.5 +--- s12/man/lilo.conf.5 2011-06-18 16:07:05.112620983 +0200 ++++ s13/man/lilo.conf.5 2011-06-18 16:32:15.389514340 +0200 +@@ -705,17 +705,26 @@ + command line parameters to this kernel. + .TP + .BI "addappend=" +-(22.6) The kernel parameters from the specified string, are concatenated to the ++The kernel parameters of this string are concatenated to the + parameter(s) from an + .B "append=" +-specification (see below). +-The string must be enclosed within double quotes. Usually, the previous ++option (see below). ++The string of addappend must be enclosed within double quotes. ++Usually, the previous + .B "append=" +-will specify parameters common to all kernels by appearing in the top, +-or global, section of the configuration file and ++will set parameters common to all kernels by appearing in the global ++section of the configuration file and + .B "addappend=" + will be used to add local parameter(s) to an individual image. +-Addappend= may be used only once per "image=" section. ++The addappend option may be used only once per "image=" section. ++.sp ++If the string is a very long line, this line can be divided ++in more lines using "\\" as last character of a line, e.g. ++.sp ++.nf ++ addappend="noapic acpi=off pci=usepirqmask \\ ++ pnpbios=off pnpacpi=off noisapnp" ++.fi + .TP + .BI "append=" + Appends the options specified to the parameter line passed to the kernel. +@@ -724,14 +733,16 @@ + kernel parameters are separated by a blank space, and the string must be + enclosed in double quotes. A local append= appearing withing an image= + section overrides any +-global append= appearing in the top section of the configuration file. +-Append= may be used only once per "image=" ++global append= appearing in the global section of the configuration file. ++The append option may be used only once per "image=" + section. To concatenate parameter strings, use "addappend=". Example: + .sp + .nf + append="mem=96M hd=576,64,32 console=ttyS1,9600" + .fi + .sp ++If the string is a very long line, this line can be divided in more lines ++using "\\" as last character of a line. See example of addappend option. + .TP + .BI "initrd=" + Specifies the initial ramdisk image to be loaded with the kernel. The diff --git a/debian/patches/series b/debian/patches/series index 4710199..40a297e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,6 @@ 08_install-also-dat-files.patch 09_use-of-newer-debhelper.patch 10_disable-upstream-scripts.patch +11_update-lilo-conf-manpage1.patch +12_update-lilo-conf-manpage2.patch +13_lilo-conf-append-info.patch diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series index 709710e..d040281 100644 --- a/debian/patches/ubuntu.series +++ b/debian/patches/ubuntu.series @@ -8,3 +8,6 @@ 08_install-also-dat-files.patch 09_use-of-newer-debhelper.patch 10_disable-upstream-scripts.patch +11_update-lilo-conf-manpage1.patch +12_update-lilo-conf-manpage2.patch +13_lilo-conf-append-info.patch -- 2.39.2