tags 757986 + patch
thanks
(p.s. KiBi - perhaps we could fix this in time for d-i Beta 2? if linux
is waiting for up to 5 more days)
Hi,
I was able to review Jeff Epler's original patch for this issue, make
sure I properly understood it, clean it up and test it again in a full
d-i image. I can now happily sign off on this as a correct fix.
I've attached it in the form of a commit for parted packaging Git. It
updates the existing kfreebsd-gnu.patch with Jeff's new code, and
refreshes the others.
Thank you,
Regards,
--
Steven Chamberlain
ste...@pyro.eu.org
diff --git a/debian/changelog b/debian/changelog
index 6b45fda..cf56fd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+parted (3.2-5) UNRELEASED; urgency=low
+
+ [ Steven Chamberlain ]
+ * kfreebsd-gnu.patch: (Thanks, Jeff Epler!)
+- Fix detection of /dev/ada as a SCSI disk type (Closes: #693510,
+ #757986)
+- Implement detection of drive model, logical and physical sector
+ sizes for SCSI disks
+ * Refresh patches
+- freebsd-zvol.patch
+- freebsd-geli.patch
+- kfreebsd_lvm.patch
+
+ -- Parted Maintainer Team Wed, 13 Aug 2014 20:24:11 +0100
+
parted (3.2-4) unstable; urgency=high
* Probe LVM logical volumes even when their physical volumes are on
diff --git a/debian/patches/freebsd-geli.patch b/debian/patches/freebsd-geli.patch
index b1003be..594632b 100644
--- a/debian/patches/freebsd-geli.patch
+++ b/debian/patches/freebsd-geli.patch
@@ -1,4 +1,4 @@
-From cc549a70b496cb4f9cdbd5de03a864922cd5c991 Mon Sep 17 00:00:00 2001
+From 4f1d7a475db350cc2b11d22ed54be6eff472e2f3 Mon Sep 17 00:00:00 2001
From: Robert Millan
Date: Fri, 28 Mar 2014 17:09:51 +
Subject: Detection of GEOM encryption devices (GELI)
@@ -12,11 +12,9 @@ Patch-Name: freebsd-geli.patch
libparted/arch/freebsd.c | 6 ++
1 file changed, 6 insertions(+)
-diff --git a/libparted/arch/freebsd.c b/libparted/arch/freebsd.c
-index a53eadc..b3f23c3 100644
--- a/libparted/arch/freebsd.c
+++ b/libparted/arch/freebsd.c
-@@ -1058,6 +1058,8 @@ _probe_kern_disks ()
+@@ -1096,6 +1096,8 @@
{
size_t listsize;
char *disklist, *pdisklist, *psave;
@@ -25,7 +23,7 @@ index a53eadc..b3f23c3 100644
if (sysctlbyname("kern.disks", NULL, &listsize, NULL, 0) != 0) {
ped_exception_throw (
-@@ -1091,6 +1093,10 @@ _probe_kern_disks ()
+@@ -1129,6 +1131,10 @@
strncat (dev_name, token, sizeof(dev_name) - strlen(_PATH_DEV) - 1);
dev_name[sizeof(dev_name) - 1] = '\0';
_ped_device_probe (dev_name);
diff --git a/debian/patches/freebsd-zvol.patch b/debian/patches/freebsd-zvol.patch
index 1da84bc..3906fa2 100644
--- a/debian/patches/freebsd-zvol.patch
+++ b/debian/patches/freebsd-zvol.patch
@@ -1,4 +1,4 @@
-From 78e2648ee6767ac54aa24d21646920b00de8e302 Mon Sep 17 00:00:00 2001
+From b62fecc10deaa9b84af44192ce52e84c1280a4a9 Mon Sep 17 00:00:00 2001
From: Robert Millan
Date: Fri, 28 Mar 2014 17:09:50 +
Subject: Detection of ZFS volumes (ZVOL)
@@ -17,8 +17,6 @@ Patch-Name: freebsd-zvol.patch
libparted/arch/freebsd.c | 40
1 file changed, 40 insertions(+)
-diff --git a/libparted/arch/freebsd.c b/libparted/arch/freebsd.c
-index 52f5293..a53eadc 100644
--- a/libparted/arch/freebsd.c
+++ b/libparted/arch/freebsd.c
@@ -23,6 +23,7 @@
@@ -29,7 +27,7 @@ index 52f5293..a53eadc 100644
#include
#include
#include
-@@ -1096,12 +1097,51 @@ _probe_kern_disks ()
+@@ -1134,12 +1135,51 @@
return 1;
}
diff --git a/debian/patches/kfreebsd-gnu.patch b/debian/patches/kfreebsd-gnu.patch
index 957aa6b..4d07fac 100644
--- a/debian/patches/kfreebsd-gnu.patch
+++ b/debian/patches/kfreebsd-gnu.patch
@@ -21,11 +21,9 @@ Patch-Name: kfreebsd-gnu.patch
7 files changed, 1272 insertions(+), 4 deletions(-)
create mode 100644 libparted/arch/freebsd.c
-diff --git a/configure.ac b/configure.ac
-index 436d0e2..038ebdc 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -61,6 +61,7 @@ case "$host_os" in
+@@ -61,6 +61,7 @@
linux*) OS=linux ;;
gnu*) OS=gnu ;;
beos*) OS=beos ;;
@@ -33,7 +31,7 @@ index 436d0e2..038ebdc 100644
*) AC_MSG_ERROR([Unknown or unsupported OS "$host_os". Only "linux", "gnu" and "beos" are supported in this version of GNU Parted.]) ;;
esac
AC_SUBST([OS])
-@@ -273,6 +274,7 @@ AC_CHECK_SIZEOF([off_t], [64], [
+@@ -273,6 +274,7 @@
#include
#include
])
@@ -41,7 +39,7 @@ index 436d0e2..038ebdc 100644
AM_ENABLE_SHARED
if test "$OS" = linux && test $ac_cv_sizeof_off_t -lt 8; then
-@@ -511,7 +513,7 @@ If you can't find one try:
+@@ -511,7 +513,7 @@
http://web.mit.edu/tytso/www/linux/e2fsprogs.html])]
)
@@ -50,7 +48,7 @@ index 436d0e2..038ebdc 100644
AC_CHECK_HEADERS([linux/ext2_fs.h])
dnl required for libparted/llseek.c (TODO: make linux-x86 only)
-@@ -570,7 +572,9 @@ AC_C_CONST
+@@ -570,7 +572,9 @@
AC_C_RESTRICT
dnl Checks for library functions.
@@ -61,11 +59,9 @@ index 436d0e2..038ebdc 100644
AC_CHECK
