Package: lilo
Severity: wishlist
Tags: patch
Hi,
Please merge the attached diffs of my 22.6.1-9.3 and 22.7.3-1.4 NMUs.
Bye,
-- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-4-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
--
Loïc Minier <[EMAIL PROTECTED]>
--- lilo-22.6.1/debian/patches/00list
+++ lilo-22.6.1/debian/patches/00list
@@ -2,6 +2,7 @@
01_lilo_allow_spaces
01_mkrescue-fixes
01_lilo.conf.5
+02_devmapper-use-major-minor
02_makefile-adds
02_second.S
03_boot-prompt
--- lilo-22.6.1/debian/changelog
+++ lilo-22.6.1/debian/changelog
@@ -1,3 +1,13 @@
+lilo (1:22.6.1-9.3) testing-proposed-updates; urgency=high
+
+ * Non-maintainer upload with approval of maintainer targetted at
+ testing-proposed-updates for RC bug fix.
+ * New patch, 02_devmapper-use-major-minor, to address device-mapper devices
+ via major/minor instead of name for DM_DEVICE_TABLE;
+ closes: #401393, #403222.
+
+ -- Loic Minier <[EMAIL PROTECTED]> Sat, 3 Feb 2007 09:22:23 +0100
+
lilo (1:22.6.1-9.2) testing-proposed-updates; urgency=low
* Non-maintainer upload to fix a few more l10n issues.
--- lilo-22.6.1.orig/debian/patches/02_devmapper-use-major-minor.dpatch
+++ lilo-22.6.1/debian/patches/02_devmapper-use-major-minor.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_devmapper-use-major-minor.dpatch by Loic Minier <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad lilo-22.6.1~/geometry.c lilo-22.6.1/geometry.c
+--- lilo-22.6.1~/geometry.c 2007-02-03 09:28:34.000000000 +0100
++++ lilo-22.6.1/geometry.c 2007-02-03 09:29:28.000000000 +0100
+@@ -906,8 +906,9 @@
+ slash++;
+ else
+ slash = dmdev;
+- if (!dm_task_set_name(dmt, slash))
+- die("device-mapper: dm_task_set_name(\"%s\") failed",dmdev);
++ if (!dm_task_set_major(dmt, MAJOR(device)) ||
++ !dm_task_set_minor(dmt, MINOR(device)))
++ die("device-mapper: dm_task_set_major() or dm_task_set_minor() failed");
+ if (!dm_task_run(dmt))
+ die("device-mapper: dm_task_run(DM_DEVICE_TABLE) failed");
+
--- lilo-22.7.3/debian/patches/00list
+++ lilo-22.7.3/debian/patches/00list
@@ -3,6 +3,7 @@
01_mkrescue-fixes
01_lilo.conf.5
01_buggy_bios_workaround
+02_devmapper-use-major-minor
02_makefile-adds
02_second.S
03_boot-prompt
--- lilo-22.7.3/debian/changelog
+++ lilo-22.7.3/debian/changelog
@@ -1,3 +1,12 @@
+lilo (1:22.7.3-1.4) unstable; urgency=low
+
+ * Non-maintainer upload with approval of maintainer for RC bug fix.
+ * New patch, 02_devmapper-use-major-minor, to address device-mapper devices
+ via major/minor instead of name for DM_DEVICE_TABLE;
+ closes: #401393, #403222.
+
+ -- Loic Minier <[EMAIL PROTECTED]> Sat, 3 Feb 2007 09:49:47 +0100
+
lilo (1:22.7.3-1.3) unstable; urgency=low
* Non-maintainer upload to fix a few more l10n issues.
--- lilo-22.7.3.orig/debian/patches/02_devmapper-use-major-minor.dpatch
+++ lilo-22.7.3/debian/patches/02_devmapper-use-major-minor.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_devmapper-use-major-minor.dpatch by Loic Minier <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad lilo-22.6.1~/geometry.c lilo-22.6.1/geometry.c
+--- lilo-22.6.1~/geometry.c 2007-02-03 09:28:34.000000000 +0100
++++ lilo-22.6.1/geometry.c 2007-02-03 09:29:28.000000000 +0100
+@@ -906,8 +906,9 @@
+ slash++;
+ else
+ slash = dmdev;
+- if (!dm_task_set_name(dmt, slash))
+- die("device-mapper: dm_task_set_name(\"%s\") failed",dmdev);
++ if (!dm_task_set_major(dmt, MAJOR(device)) ||
++ !dm_task_set_minor(dmt, MINOR(device)))
++ die("device-mapper: dm_task_set_major() or dm_task_set_minor() failed");
+ if (!dm_task_run(dmt))
+ die("device-mapper: dm_task_run(DM_DEVICE_TABLE) failed");
+
