Commit 489dc8dc authored by Joachim Wiedorn's avatar Joachim Wiedorn

Update of some patches; remove of some patches

parent e3b1f4be
......@@ -4,6 +4,7 @@ lilo (1:23.2-1) unstable; urgency=low
- 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
......
......@@ -2,14 +2,14 @@ Package: lilo
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 \
......@@ -19,9 +19,9 @@ diff -urN s00/make.vars s01/make.vars
# 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
#
......
......@@ -2,13 +2,13 @@ Package: lilo
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 @@
......@@ -19,21 +19,23 @@ diff -urN s01/src/crt.S s02/src/crt.S
#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();
......@@ -2,13 +2,13 @@ Package: lilo
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 @@
......@@ -19,21 +19,23 @@ diff -urN s01/src/crt.S s02/src/crt.S
#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();
......@@ -2,14 +2,14 @@ Package: lilo
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);
......
......@@ -2,7 +2,7 @@ Package: lilo
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
......@@ -10,8 +10,8 @@ lines.
---
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)
......@@ -37,10 +37,10 @@ diff -urN s08/images/Makefile s09/images/Makefile
+ 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
......@@ -54,15 +54,15 @@ diff -urN s08/Makefile s09/Makefile
# 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
......
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);
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
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,
This diff is collapsed.
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);
}
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
......@@ -7,9 +7,3 @@
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
......@@ -7,9 +7,3 @@
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment