From 49ef4f62f995b92f7c218f45c32d64bf127558e4 Mon Sep 17 00:00:00 2001 From: Joachim Wiedorn Date: Sun, 20 Mar 2011 15:41:20 +0100 Subject: [PATCH] Fix misleading error message in geometry.c --- debian/changelog | 4 +++- .../14_fix-missleading-error-message.patch | 22 +++++++++++++++++++ debian/patches/series | 1 + debian/patches/ubuntu.series | 1 + 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 debian/patches/14_fix-missleading-error-message.patch diff --git a/debian/changelog b/debian/changelog index 2c25c40..452f31d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ lilo (1:23.1-2) unstable; urgency=low - Remove dependency to lilo in package lilo-doc. (Closes: #613753) * Fix: save errno for second command (device.c). * Fix: save file permissions for converted lilo.conf. (Closes: #615103) + * Fix: missleading error message in geometry.c. (Closes: #445264) * Reformatting of mkrescue manpage (thanks to M.E. Schauer). (Closes: #617282) * debconf scripts: @@ -33,6 +34,7 @@ lilo (1:23.1-1) unstable; urgency=low * Upstream bugfixes: - Option 'append' works with acpi=off. (Closes: #428390) - Working on degraded RAID-1 device. (Closes: #278373, #522283) + - Working with MD v1.0 RAID-1 boot devices. (Closes: #598035) - Working with spaces in labels. (Closes: #287257) - Using new hook scripts for kernel and initrd only one time when needed. (Closes: #599934) @@ -91,7 +93,7 @@ lilo (1:23.1-1) unstable; urgency=low * Remove obsolete file debian/NEWS. * Remove obsolete debian/TODO file. * Remove obsolete debian/lilo.changelogs file. - * Add patchset and changelog entries for use in Ubuntu. + * Add patchset and changelog entries for use in Ubuntu. (Closes: #602824) * debconf files: - Remove message above old bitmap path. (Closes: #304065) diff --git a/debian/patches/14_fix-missleading-error-message.patch b/debian/patches/14_fix-missleading-error-message.patch new file mode 100644 index 0000000..17167ff --- /dev/null +++ b/debian/patches/14_fix-missleading-error-message.patch @@ -0,0 +1,22 @@ +Package: lilo +Subject: fix missleading error message +Author: Gabor Burjan +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); + } diff --git a/debian/patches/series b/debian/patches/series index da6b640..f7af3af 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ 11_remove-obsolete-bios-workaround.patch 12_save-errno-for-second-command.patch 13_reformatted-mkrescue-manpage.patch +14_fix-missleading-error-message.patch diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series index 235385c..a575cef 100644 --- a/debian/patches/ubuntu.series +++ b/debian/patches/ubuntu.series @@ -11,3 +11,4 @@ 11_remove-obsolete-bios-workaround.patch 12_save-errno-for-second-command.patch 13_reformatted-mkrescue-manpage.patch +14_fix-missleading-error-message.patch -- 2.39.2