- Fix for larger kernel setup code. (Closes: #625266)
- Update of manpages (mkrescue.8, lilo.conf.5).
- Add new scripts 'liloconfig' and 'lilo-uuid-diskid'.
+ * Update of some patches; remove of some patches (now in upstream).
-- Joachim Wiedorn <ad_debian@joonet.de> Fri, 06 May 2011 18:07:43 +0200
Subject: add autoauto and diag1.img to makefile
Author: Joachim Wiedorn <ad_debian at joonet.de>
Forwarded: no
-Last-Update: 2010-11-11
+Last-Update: 2011-05-06
---
diff -urN s00/make.vars s01/make.vars
---- s00/make.vars 2010-06-28 22:47:31.000000000 +0200
-+++ s01/make.vars 2010-11-04 23:15:56.367070520 +0100
-@@ -65,7 +65,7 @@
+--- s00/make.vars 2011-04-09 16:59:26.000000000 +0200
++++ s01/make.vars 2011-05-06 17:25:55.864706382 +0200
+@@ -71,7 +71,7 @@
CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \
-DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \
# set the following if you wish LILO.COM to be installed
DOS_DIR=/dosC/boot
diff -urN s00/src/Makefile s01/src/Makefile
---- s00/src/Makefile 2010-11-04 16:35:52.000000000 +0100
-+++ s01/src/Makefile 2010-11-04 23:15:50.831064767 +0100
-@@ -41,7 +41,7 @@
+--- s00/src/Makefile 2011-04-09 16:59:26.000000000 +0200
++++ s01/src/Makefile 2011-05-06 17:25:55.882961287 +0200
+@@ -48,7 +48,7 @@
#
# everything needed to run, just short of installation
#
Subject: add lilo version for Debian
Author: Joachim Wiedorn <ad_debian at joonet.de>
Forwarded: no
-Last-Update: 2011-01-28
+Last-Update: 2011-05-06
---
diff -urN s01/src/crt.S s02/src/crt.S
--- s01/src/crt.S 2010-11-01 16:32:09.000000000 +0100
-+++ s02/src/crt.S 2010-11-05 00:30:35.183058179 +0100
++++ s02/src/crt.S 2011-05-06 17:26:25.856704412 +0200
@@ -694,7 +694,7 @@
#ifdef LCF_VERSION
.ascii SA(VERSION_MAJOR)
diff -urN s01/src/lilo.c s02/src/lilo.c
---- s01/src/lilo.c 2010-06-28 23:29:23.000000000 +0200
-+++ s02/src/lilo.c 2010-11-05 00:29:44.219065803 +0100
-@@ -819,6 +819,7 @@
- printf("LILO version %d.%d%s%s", VERSION_MAJOR, VERSION_MINOR,
- VERSION_EDIT, test ? " (test mode)" : "");
- if (version && verbose<=0) {
-+ printf (" (Debian GNU/Linux)");
- printf("\n");
- return 0;
- }
-@@ -843,6 +844,7 @@
- }
+--- s01/src/lilo.c 2011-04-09 18:40:33.000000000 +0200
++++ s02/src/lilo.c 2011-05-06 17:28:53.484698617 +0200
+@@ -824,7 +824,8 @@
+ else
+ printf(" (released %s)\n", VERSION_DATE);
+ if (version && verbose<=0) {
+- /* exit if user asks for version and no verbose */
++ /* user asks for version without verbose */
++ printf ("(Debian GNU/Linux)\n");
+ return 0;
+ }
+ printf(" * Copyright (C) 1992-1998 Werner Almesberger (until v20)\n"
+@@ -847,6 +848,7 @@
+ }
#endif
- }
-+ printf ("Debian GNU/Linux\n");
+ }
++ printf("Debian GNU/Linux\n");
printf("\n");
if (version) {
if (verbose>=2) configuration();
Subject: add lilo version for Ubuntu
Author: Joachim Wiedorn <ad_debian at joonet.de>
Forwarded: no
-Last-Update: 2011-01-28
+Last-Update: 2011-05-06
---
diff -urN s01/src/crt.S s02/src/crt.S
--- s01/src/crt.S 2010-11-01 16:32:09.000000000 +0100
-+++ s02/src/crt.S 2010-11-05 00:30:35.183058179 +0100
++++ s02/src/crt.S 2011-05-06 17:26:25.856704412 +0200
@@ -694,7 +694,7 @@
#ifdef LCF_VERSION
.ascii SA(VERSION_MAJOR)
diff -urN s01/src/lilo.c s02/src/lilo.c
---- s01/src/lilo.c 2010-06-28 23:29:23.000000000 +0200
-+++ s02/src/lilo.c 2010-11-05 00:29:44.219065803 +0100
-@@ -819,6 +819,7 @@
- printf("LILO version %d.%d%s%s", VERSION_MAJOR, VERSION_MINOR,
- VERSION_EDIT, test ? " (test mode)" : "");
- if (version && verbose<=0) {
-+ printf (" (Ubuntu GNU/Linux)");
- printf("\n");
- return 0;
- }
-@@ -843,6 +844,7 @@
- }
+--- s01/src/lilo.c 2011-04-09 18:40:33.000000000 +0200
++++ s02/src/lilo.c 2011-05-06 17:28:53.484698617 +0200
+@@ -824,7 +824,8 @@
+ else
+ printf(" (released %s)\n", VERSION_DATE);
+ if (version && verbose<=0) {
+- /* exit if user asks for version and no verbose */
++ /* user asks for version without verbose */
++ printf ("(Ubuntu GNU/Linux)\n");
+ return 0;
+ }
+ printf(" * Copyright (C) 1992-1998 Werner Almesberger (until v20)\n"
+@@ -847,6 +848,7 @@
+ }
#endif
- }
-+ printf ("Ubuntu GNU/Linux\n");
+ }
++ printf("Ubuntu GNU/Linux\n");
printf("\n");
if (version) {
if (verbose>=2) configuration();
Subject: notinteractive for debian
Author: Joachim Wiedorn <ad_debian at joonet.de>
Forwarded: no
-Last-Update: 2010-11-11
+Last-Update: 2011-05-06
---
-diff -urN v08/src/device.c v09/src/device.c
---- v08/src/device.c 2010-07-03 09:36:00.637903317 +0200
-+++ v09/src/device.c 2010-07-03 09:37:44.660354270 +0200
-@@ -847,7 +847,9 @@
+diff -urN s05/src/device.c s06/src/device.c
+--- s05/src/device.c 2011-04-09 17:03:29.000000000 +0200
++++ s06/src/device.c 2011-05-06 17:37:44.716712084 +0200
+@@ -849,7 +849,9 @@
"This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
, vm->name, MAJOR(dev), MINOR(dev), dev);
Subject: use of newer debhelper 7.0.50 and above
Author: Joachim Wiedorn <ad_debian at joonet.de>
Forwarded: no
-Last-Update: 2010-11-13
+Last-Update: 2011-05-06
With the possibilities of debhelper of 7.0.50 and above and some
direct patches in the sources the rules can be reduced to few
---
diff -urN s08/images/Makefile s09/images/Makefile
---- s08/images/Makefile 2010-11-13 18:39:14.558043894 +0100
-+++ s09/images/Makefile 2010-11-13 20:23:08.510034528 +0100
+--- s08/images/Makefile 2011-05-06 17:40:18.924705158 +0200
++++ s09/images/Makefile 2011-05-06 17:45:57.304713832 +0200
@@ -23,11 +23,11 @@
install: all
mkdir -p $$DESTDIR$(BOOT_DIR)
+ done
diff -urN s08/Makefile s09/Makefile
---- s08/Makefile 2010-11-04 16:35:15.000000000 +0100
-+++ s09/Makefile 2010-11-13 20:23:08.498047887 +0100
-@@ -1,6 +1,14 @@
- # -*- makefile -*-
+--- s08/Makefile 2011-04-09 17:14:05.000000000 +0200
++++ s09/Makefile 2011-05-06 17:45:57.304713832 +0200
+@@ -8,6 +8,14 @@
+ #
#
+# everything needed to run, just short of installation
# make help
#
help:
-@@ -27,13 +35,6 @@
+@@ -34,13 +42,6 @@
@echo ""
#
-# everything needed to run, just short of installation
-#
-all: test
-- make -C src all
-- make -C images all
+- $(MAKE) -C src all
+- $(MAKE) -C images all
-
-#
# everything above plus the statically linked version
+++ /dev/null
-Package: lilo
-Subject: add usage hints about -H option
-Author: Joachim Wiedorn <ad_debian at joonet.de>
-Forwarded: yes
-Last-Update: 2010-11-20
-
-The already existing option '-H' isn't listed in the usage,
-if you run 'lilo --help'. Now one line is added.
----
-
-diff -urN s09/src/lilo.c s10/src/lilo.c
---- s09/src/lilo.c 2010-11-04 23:18:47.000000000 +0100
-+++ s10/src/lilo.c 2010-11-20 15:51:32.270152972 +0100
-@@ -542,6 +542,7 @@
- fprintf(errstd,"%7s%s [ -C config_file ] -I name [ options ]\n","",name);
- fprintf(errstd,"%7s%s [ -C config_file ] [ -s save_file ] "
- "-u | -U [ boot_device ]\n","",name);
-+ fprintf(errstd,"%7s%s -H\t\t\t\tinstall only to active discs (RAID-1)\n", "", name);
- fprintf(errstd,"%7s%s -A /dev/XXX [ N ]\t\tinquire/activate a partition\n","",name);
- fprintf(errstd,"%7s%s -M /dev/XXX [ mbr | ext ]\tinstall master boot record\n","",name);
- fprintf(errstd,"%7s%s -T help \t\t\tlist additional options\n", "", name);
+++ /dev/null
-Package: lilo
-Subject: remove obsolete bios workaround
-Author: Joachim Wiedorn <ad_debian at joonet.de>
-Forwarded: yes
-Last-Update: 2011-01-18
-
-In the changelog of Debian lilo 22.2-3.1 (from 2002-05-10) was noted:
-
- * This upstream version uses int15,0xe820 to fetch the memory map.
- However, sufficiently many systems don't implement this interrupt
- correctly. We avoid the errant code for now. The next upstream
- release fixes this problem for real. Note to Russell: this patch
- must be removed for the next upstream release.
-
-Unfortunately nobody had remembered to this note and removed this
-workaround with the new upstream release. But the upstream release
-22.3 (from 2002-10-19) of have the following note in its CHANGES:
-
- - Compensate for buggy BIOS in int 15h, fn E820h call to avoid
- overlapping memory areas
-
-Now I remove this very old workaround because it is obsolete since
-May 2002!
----
-
-diff -urN s10/src/second.S s11/src/second.S
---- s10/src/second.S 2010-06-20 00:20:26.000000000 +0200
-+++ s11/src/second.S 2011-01-18 20:18:55.903147359 +0100
-@@ -2927,8 +2927,7 @@
- xor edx,edx ; flag nothing found
- xor esi,esi ; flag size==0
- xor ebx,ebx
-- ;jmp e8go ; circumvented due to BIOS problems
-- br no_e801 ; skip to backup plan
-+ jmp e8go
- e8go2: or ebx,ebx ; test for end
- jz e8go5
- e8go: push edx ; save best prospect
+++ /dev/null
-Package: lilo
-Subject: save errno for second command
-Author: Joachim Wiedorn <ad_debian at joonet.de>
-Forwarded: yes
-Last-Update: 2011-02-17
-
-The problem is that fprintf can alter the value of errno
-(see man perror). In a weired case the user get a bogus error
-because the real error was hidden by fprintf.
----
-
-diff -urN s11/src/device.c s12/src/device.c
---- s11/src/device.c 2011-02-17 22:07:17.167142581 +0100
-+++ s12/src/device.c 2011-02-17 22:20:03.047152869 +0100
-@@ -197,6 +197,7 @@
- char name[PATH_MAX];
- ST_BUF st;
- int count;
-+ int err;
-
- if (lookup_dev(name,dev,number)) dev->delete = 0;
- else {
-@@ -235,11 +236,12 @@
- #endif
- if (flags == O_BYPASS) dev->fd = -1;
- else if ((dev->fd = open(name,flags)) < 0) {
-- fprintf (errstd, "Cannot proceed. Maybe you need to add "
-+ err = errno;
-+ fprintf (errstd, "Cannot proceed. Maybe you need to add "
- "this to your lilo.conf:\n"
- "\tdisk=%s inaccessible\n"
- "(real error shown below)\n", name);
-- die("open %s: %s",name,strerror(errno));
-+ die("open %s: %s",name,strerror(err));
- }
- dev->name = stralloc(name);
- return dev->fd;
-@@ -714,11 +716,11 @@
-
- fd = dev_open(&dev, device, option ? O_RDWR : O_RDONLY);
- if (read(fd, &buf, sizeof(buf)) != sizeof(buf)) {
-- fprintf (errstd, "Cannot proceed. Maybe you need to add "
-+ fprintf (errstd, "Cannot proceed. Maybe you need to add "
- "this to your lilo.conf:\n"
- "\tdisk=%s inaccessible\n"
- "(real error shown below)\n", dev.name);
-- die("VolumeID read error: sector 0 of %s not readable", dev.name);
-+ die("VolumeID read error: sector 0 of %s not readable", dev.name);
- }
- if (option==ID_SET) {
- make_backup(NULL, 0, &buf, device,
+++ /dev/null
-Package: lilo
-Subject: reformatted mkrescue manpage
-Author: Martin Eberhard Schauer <Martin.E.Schauer@gmx.de>
-Forwarded: yes
-Last-Update: 2011-03-07
-
-The formatting did not obey the recommendations of man (7) and
-man-pages (7).
----
-
-diff -urN s12/man/mkrescue.8 s13/man/mkrescue.8
---- s12/man/mkrescue.8 2010-11-01 17:13:41.000000000 +0100
-+++ s13/man/mkrescue.8 2011-03-07 21:25:53.000000000 +0100
-@@ -2,130 +2,155 @@
- .\" @(#)mkrescue.8 1.0 20011031 jrc
- .\" This page is part of the LILO package, which is released by
- .\" the author(s) under a BSD license. See the file COPYING
--.\" in the LILO source directory for the License and Disclaimer.
-+.\" in the LILO source directory for the license and disclaimer.
- .\"
- .\" Original version, John Coffman 2001-10-31
- .\" Updated to version 2.0 & lilo 22.5.4, John Coffman 2003-05-24
--.\"
- .\" Updated to version 3.0 & lilo 22.6.1, John Coffman 2004-11-16
--.\"
--.TH MKRESCUE 8 "16 Nov 2004"
-+.\" Reformatted to better match Linux man-pages conventions
-+.\" Martin Eberhard Schauer 2011-03-06
-+
-+.TH MKRESCUE 8 "6 Mar 2011"
-+
- .SH NAME
--mkrescue \- make rescue floppy
-+mkrescue \- make rescue floppy or CD
-+
- .SH SYNOPSIS
--.LP
--.B "/usr/sbin/mkrescue"
--\- make a bootable rescue floppy or CD using the default kernel specified
--in \fIlilo.conf\fP.
-+.B /sbin/mkrescue
-+makes a bootable rescue floppy or CD using the default kernel specified in
-+.IR lilo.conf .
-+
- .SH DESCRIPTION
--.LP
--.B mkrescue
--takes its specification for the kernel from the default image specified in
--\fB/etc/lilo.conf\fP. If the actual default is an \fIother=\fP specification,
--then use the first \fIimage=\fP specification.
--Any associated initial ramdisk (initrd=), and \fIappend=\fP
--options will also be used. The root directory will be taken to be the
--\fIcurrent\fP root. A bootable floppy or CD-image will be created using LILO version
-+\fBmkrescue\fP takes its specifation for the kernel from the default image
-+specified in \fI/etc/lilo.conf\fP.
-+If the actual default is an \fIother=\fP specification, then use the first
-+\fIimage=\fP specification.
-+Any associated initial ramdisk (\fIinitrd=\fP), and \fIappend=\fP options
-+will also be used.
-+The root directory will be taken to be the \fIcurrent\fP root.
-+A bootable floppy or CD-image will be created using LILO version
- 22.5.5 or later.
--.B mkrescue
--normally requires no options, unless a CD-image is desired (\fI--iso\fP).
-+\fBmkrescue\fP normally requires no options, unless a CD-image is desired
-+(\fB--iso\fP).
-+
- .SH OPTIONS
--.LP
-+
- .TP
--.BI "--append <string>"
--Override any \fIappend=\fP options taken from the default image. If there is
--any doubt about whether the \fIlilo.conf\fP options are correct, then specify
--no kernel parameters with: \fB--append ""\fP, the null string.
--.TP
--.BI "--debug"
--Provide verbose output of the operation of "mkrescue", pausing to allow
--the setting of internal operating parameters to be viewed. "<CR>" must
--be hit to proceed from these pauses.
--.TP
--.BI "--device <device>"
--Make the floppy on a device other than /dev/fd0. The floppy disk will
--always be made to boot on BIOS device code 0x00 (A: drive), without
--regard to the drive on which it is created.
--.TP
--.BI "--fast"
--Use a faster method of creating the boot floppy. This involves first
--creating a file of "\-\-size" 1k blocks (default is 1440)
--mounted using a loopback device, creating the bootable floppy,
-+\fB--append\fP <string>
-+Override any \fIappend=\fP options taken from the default image.
-+If there is any doubt about whether the \fIlilo.conf\fP
-+options are correct, then specify no kernel parameters by providing the
-+null string (\fB--append ""\fP).
-+
-+.TP
-+.B --debug
-+Provide verbose output of the operation of
-+.BR mkrescue ,
-+pausing to allow the setting of internal operating parameters to be viewed.
-+<CR> must be hit to proceed from these pauses.
-+
-+.TP
-+\fB--device\fP <device>
-+Make the floppy on a device other than \fI/dev/fd0\fP.
-+The floppy disk will always be made to boot on BIOS device code 0x00 (A:
-+drive), without regard to the drive on which it is created.
-+
-+.TP
-+.B --fast
-+Use a faster method of creating the boot floppy.
-+This involves first creating a file of \fB--size\fP 1k blocks (default
-+is 1440) mounted using a loopback device, creating the bootable floppy,
- then copying the entire file to the disk.
-+
- .TP
--.BI "--fs [ ext2 | msdos | minix ]"
-+\fB--fs\fP [ \fIext2\fP | \fImsdos\fP | \fIminix\fP ]
- Specify the type of filesystem to create on the drive.
--.B ext2
--is the default, but "msdos" and "minix" allow slightly more disk sectors
--for really big kernels.
-+\fIext2\fP is the default, but \fImsdos\fP and \fIminix\fP allow
-+slightly more disk sectors for really big kernels.
-+
- .TP
--.BI "--help"
-+.B --help
- Print a short usage synopsis, including a list of command options.
-+
- .TP
--.BI "--image <label>"
-+\fB--image\fP <label>
- Specifies the label or alias of the particular image from which the
--append, initial ramdisk, root, keytable, and kernel information is to be
--taken.
-+append, initial ramdisk, root, keytable, and kernel information is to
-+be taken.
-+
- .TP
--.BI "--initrd <filepath>" " and " "--kernel <filepath>"
-+\fB--initrd\fP \fI<filepath>\fP and \fB--kernel\fP \fI<filepath>\fP
- These options, which must be used together, allow specification of an
- arbitrary kernel file and initial ramdisk file to be used on the created
--boot floppy. Be sure you know what you are doing before you use these
--options. If no initial ramdisk is needed with a particular kernel, then you
--MUST specify \fB--initrd ""\fP, meaning a null pathname.
-+boot floppy.
-+Be sure you know what you are doing before you use these options.
-+If no inital ramdisk is needed with a particular kernel, then you MUST
-+specify \fB--initrd ""\fP, meaning a null pathname.
-+
- .TP
--.BI "--install [ text | menu ]"
-+\fB--install\fP [ \fItext\fP | \fImenu\fP ]
- Allows overriding the default human interface used with the rescue
--bootloader (configuration file "install=" option). "text" is the
--default on 1.2MB and 1.44MB floppy disks, and "menu" is the default on
--2.88MB floppies and HD emulation on CD-R media.
--.TP
--.BI "--iso"
--Create an ISO-9660 bootable CD image (El Torito Format) suitable for burning
--to a CD-R or CD-RW. The \fB--device\fP specification defaults to the
--filename \fB"rescue.iso"\fP, and the \fB--size\fP defaults to 2880. A utility
--such as \fIcdrecord\fP may be used to burn the ISO file to a recordable CD
--medium. With this ISO option, the
--.B "--size HD"
--option is allowed.
-+bootloader (configuration file "install=" option). \fItext\fP is the
-+default on 1.2MB and 1.44MB floppy disks, and \fImenu\fP is the default
-+on 2.88MB floppies and HD emulation on CD-R media.
-+
-+.TP
-+.BI --iso
-+Create an ISO-9660 bootable CD image (El Torito Format) suitable for
-+burning to a CD-R or CD-RW. The \fB--device\fP specification defaults to
-+the filename \fIrescue.iso\fP, and the \fB--size\fP defaults to 2880.
-+A utility such as "wodim" may be used to burn the ISO file to a
-+recordable CD medium.
-+With this ISO option, the \fB--size\fP \fIHD\fP option is allowed.
-+
- .TP
--.BI "--nocompact"
-+.BI --nocompact
- For faster kernel loading from a floppy, LILO map compaction is normally
--enabled. This option will disable map compaction by omitting the
--lilo "\-c" switch.
--.TP
--.BI "--noformat"
--Suppresses creation of a new filesystem on the boot floppy. This option may
--be used
--.B only
-+enabled.
-+This option will disable map compaction by omitting the lilo \fB-c\fP
-+switch.
-+
-+.TP
-+.BI --noformat
-+Suppresses creation of a new filesystem on the boot floppy.
-+This option may be used ONLY
- when you know that the floppy you will be writing upon is formatted with the
--same filesystem as specified by "\-\-fs XXX" (default is ext2).
-+same filesystem as specified by \fB--fs\fP \fIXXX\fP (default is \fIext2\fP).
-+
- .TP
--.BI "--root <device>"
--Specify the root filesystem for the kernel on the boot floppy. The currently
--mounted root is taken as the default specification.
--.TP
--.BI "--size [ 1440 | 1200 | 2880 | HD ]"
--The default floppy disk size is \fI1440\fP, meaning a 1.44MB floppy. When \fI--iso\fP
--is specified, the default size is \fI2880\fP. Allowed
--specifications are 1200, 1440, or 2880, meaning a 1.2MB, 1.44MB or 2.88MB
--floppy, respectively. No other floppy disk sizes are supported.
-+\fB--root\fP \fI<device>\fP
-+Specify the root filesystem for the kernel on the boot floppy.
-+The currently mounted root is taken as the default specification.
-+
-+.TP
-+\fB--size\fP [ \fI1440\fP | \fI1200\fP | \fI2880\fP | \fIHD\fP ]
-+The default floppy disk size is \fI1440\fP, meaning a 1.44MB floppy.
-+When \fB--iso\fP is specified, the default size is \fI2880\fP.
-+Allowed specifications are \fI1200\fP, \fI1440\fP, or \fI2880\fP, meaning
-+a 1.2MB, 1.44MB or 2.88MB floppy, respectively.
-+No other floppy disk sizes are supported.
- .sp
--The
--.I HD
--specification, meaning "hard disk", may only be used with the
--.B "--iso"
--option, to indicate a 16MB hard disk is to be generated for emulation. This
--allows for very large kernel / initial ramdisk combinations on CD-R. The
--hard disk image is created using loopback devices
--"/dev/loop0" and "/dev/loop1", which
--must be free to utilize this size option.
--.TP
--.BI "--version"
--Print the version number of \fImkrescue\fP, then terminate.
--.TE
-+The \fIHD\fP specification, meaning "hard disk", may only be used with
-+the \fB--iso\fP option, to indicate a 16MB hard disk is to be generated
-+for emulation.
-+This allows for very large kernel/initial ramdisk combinations on CD-R.
-+The hard disk image is created using loopback devices \fI/dev/loop0\fP
-+and \fI/dev/loop1\fP, which must be free to utilize this size option.
-+
-+.TP
-+.BI --version
-+Print the version number of \fBmkrescue\fP, then terminate.
-+
- .SH "SEE ALSO"
--lilo(8), lilo.conf(5), mkfs(8), dd(1), mount(8), mkinitrd(8), mkisofs(8),
--cdrecord(1).
--.SH "AUTHOR"
--John Coffman <johninsd@san.rr.com> (3.0)
-+.BR cdrecord (1),
-+.BR dd (1),
-+.BR wodim (1),
-+.BR lilo.conf (5),
-+.BR lilo (8),
-+.BR mkfs (8),
-+.BR mkinitrd (8),
-+.BR mkisofs (8),
-+.BR mount (8)
-+
-+.\" .SH "AUTHOR"
-+.\" John Coffman <johninsd@san.rr.com> (3.0)
+++ /dev/null
-Package: lilo
-Subject: fix missleading error message
-Author: Gabor Burjan <buga@buvoshetes.hu>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=445264
-Forwarded: yes
-Last-Update: 2011-03-14
-
-A '%' character is missing from the format string.
----
-
-diff -urN s13/src/geometry.c s14/src/geometry.c
---- s13/src/geometry.c 2010-11-01 20:22:54.000000000 +0100
-+++ s14/src/geometry.c 2011-03-14 20:16:32.959787075 +0100
-@@ -785,7 +785,7 @@
-
- if ((MAJOR(device)>=120 && MAJOR(device)<=127) ||
- (MAJOR(device)>=240 && MAJOR(device)<=254) )
-- die("Linux experimental device 0x04x needs to be defined.\n"
-+ die("Linux experimental device 0x%04x needs to be defined.\n"
- "Check 'man lilo.conf' under 'disk=' and 'max-partitions='", device);
- else die("Sorry, don't know how to handle device 0x%04x",device);
- }
+++ /dev/null
-Package: lilo
-Subject: fix typos in manpage lilo conf
-Author: Joachim Wiedorn <ad_debian at joonet.de>
-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=" <fg>,<bg>,<sh>,<hfg>,<hbg>,<hsh>
- 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=<letter>
--below).
-+boot sector it loads only to DOS on FAT12 or FAT16, or Windows on FAT16 or
-+FAT32.
- .TP
- .BI "table=" <device>
- This specifies the device that contains the partition table.
-@@ -856,14 +848,9 @@
- with `table' is modified.
- .TP
- .BI "table=" <drive-letter>
--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
07_bad-partition-warn.patch
08_install-also-dat-files.patch
09_use-of-newer-debhelper.patch
-10_add-info-about-h-option.patch
-11_remove-obsolete-bios-workaround.patch
-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
07_bad-partition-warn.patch
08_install-also-dat-files.patch
09_use-of-newer-debhelper.patch
-10_add-info-about-h-option.patch
-11_remove-obsolete-bios-workaround.patch
-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
projects / rrq / maintain_lilo.git / commitdiff