Bug#607526: unblock: parted/2.3-5
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
parted (2.3-5) unstable; urgency=low
* Remove DASD restriction on _disk_sync_part_table, as otherwise DASD
partitioning will never work properly (closes: #605759).
-- Colin Watson <cjwatson@debian.org> Sun, 19 Dec 2010 12:57:43 +0000
As far as I can tell, this bug completely broke s390 installations,
which makes it RC in my book. The patch is from Fedora/upstream and
just removes a stale special case.
diff --git a/debian/patches/dasd-sync.patch b/debian/patches/dasd-sync.patch
new file mode 100644
index 0000000..0f50542
--- /dev/null
+++ b/debian/patches/dasd-sync.patch
@@ -0,0 +1,49 @@
+Description: Remove DASD restriction on _disk_sync_part_table
+Origin: upstream, http://git.debian.org/?p=parted/parted.git;a=commitdiff;h=9fa0e1800db5b9f094ae481fd95a51da03f19e95
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=651478
+Bug-Debian: http://bugs.debian.org/605759
+Forwarded: not-needed
+Author: Brian C. Lane <bcl@redhat.com>
+Last-Update: 2010-12-19
+
+Index: b/libparted/arch/linux.c
+===================================================================
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -40,6 +40,7 @@
+ #include <sys/types.h>
+ #include <sys/utsname.h> /* for uname() */
+ #include <scsi/scsi.h>
++#include <assert.h>
+ #ifdef ENABLE_DEVICE_MAPPER
+ #include <libdevmapper.h>
+ #endif
+@@ -2807,20 +2808,15 @@
+ return _dm_reread_part_table (disk);
+ #endif
+ if (disk->dev->type != PED_DEVICE_FILE) {
+- /* The ioctl() command BLKPG_ADD_PARTITION does not notify
+- * the devfs system; consequently, /proc/partitions will not
+- * be up to date, and the proper links in /dev are not
+- * created. Therefore, if using DevFS, we must get the kernel
+- * to re-read and grok the partition table.
+- */
+- /* Work around kernel dasd problem so we really do BLKRRPART */
+- int ok = 1;
+- if (disk->dev->type != PED_DEVICE_DASD && _have_blkpg ()) {
+- if (!_disk_sync_part_table (disk))
+- ok = 0;
+- }
+
+- return ok;
++ /* We now require BLKPG support. If this assertion fails,
++ please write to the mailing list describing your system.
++ Assuming it's never triggered, ...
++ FIXME: remove this assertion in 2012. */
++ assert (_have_blkpg ());
++
++ if (!_disk_sync_part_table (disk))
++ return 0;
+ }
+
+ return 1;
diff --git a/debian/patches/series b/debian/patches/series
index 7b76e4e..d95d840 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,6 +16,7 @@ zero-length-devices.patch
sun-revert-disk-flag.patch
sun-raid-type-test-fix.patch
tiny-disk-constraint.patch
+dasd-sync.patch
# Symbols for this ABI (amd64 as reference)
update-abi-symbols.patch
Thanks,
--
Colin Watson [cjwatson@debian.org]
Reply to: