From 5f59f6e0eb8982a697fd296197e3489a28592eb6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 16 Apr 2026 20:59:16 +0100 Subject: [PATCH 1/2] Fix CHS geometry error for Veritas/Sun partitions resolves: RHEL-165220 --- ...-Refactor-is_partition_can_hold_file.patch | 87 +++++++++++++ ...-Ignore-CHS-geometry-error-from-part.patch | 114 ++++++++++++++++++ libguestfs.spec | 8 +- 3 files changed, 207 insertions(+), 2 deletions(-) create mode 100644 0005-daemon-listfs.ml-Refactor-is_partition_can_hold_file.patch create mode 100644 0006-daemon-listfs.ml-Ignore-CHS-geometry-error-from-part.patch diff --git a/0005-daemon-listfs.ml-Refactor-is_partition_can_hold_file.patch b/0005-daemon-listfs.ml-Refactor-is_partition_can_hold_file.patch new file mode 100644 index 0000000..48599e3 --- /dev/null +++ b/0005-daemon-listfs.ml-Refactor-is_partition_can_hold_file.patch @@ -0,0 +1,87 @@ +From 6a27009836aa3ae0883144cc662559fd1bcdcb66 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 16 Apr 2026 08:06:50 +0100 +Subject: [PATCH] daemon/listfs.ml: Refactor is_partition_can_hold_filesystem + +Refactor and simplify the function. + +This is just code motion, there is no functional change. + +(cherry picked from commit 88bd07f350407619d4f5fe406c5594b50cf541dd) +--- + daemon/listfs.ml | 53 ++++++++++++++++++++---------------------------- + 1 file changed, 22 insertions(+), 31 deletions(-) + +diff --git a/daemon/listfs.ml b/daemon/listfs.ml +index 4c90796ef..067314c47 100644 +--- a/daemon/listfs.ml ++++ b/daemon/listfs.ml +@@ -115,43 +115,34 @@ and is_not_partitioned_device device = + * Windows Snapshot Partition as well as MBR extended partitions. + *) + and is_partition_can_hold_filesystem partition = +- let device = Devsparts.part_to_dev partition in +- let partnum = Devsparts.part_to_partnum partition in +- let parttype = Parted.part_get_parttype device in ++ let device = Devsparts.part_to_dev partition ++ and partnum = Devsparts.part_to_partnum partition in + +- let is_gpt = parttype = "gpt" in +- let is_mbr = parttype = "msdos" in +- let is_gpt_or_mbr = is_gpt || is_mbr in ++ match Parted.part_get_parttype device with ++ | "msdos" -> ++ if Parted.part_get_mbr_part_type device partnum = "extended" then ++ false ++ else if partnum = 1 && Utils.has_bogus_mbr device then ++ true ++ else ++ true + +- if is_gpt_or_mbr then ( +- if is_mbr_extended parttype device partnum then +- false +- else if is_mbr_bogus parttype device partnum then +- true +- else if is_mbr then +- true +- else ( +- let gpt_type = Sfdisk.part_get_gpt_type device partnum in +- match gpt_type with ++ | "gpt" -> ++ let gpt_type = Sfdisk.part_get_gpt_type device partnum in ++ (match gpt_type with + (* Windows Logical Disk Manager metadata partition. *) + | "5808C8AA-7E8F-42E0-85D2-E1E90434CFB3" +- (* Windows Logical Disk Manager data partition. *) +- | "AF9B60A0-1431-4F62-BC68-3311714A69AD" +- (* Microsoft Reserved Partition. *) +- | "E3C9E316-0B5C-4DB8-817D-F92DF00215AE" +- (* Windows Snapshot Partition. *) +- | "CADDEBF1-4400-4DE8-B103-12117DCF3CCF" -> false ++ (* Windows Logical Disk Manager data partition. *) ++ | "AF9B60A0-1431-4F62-BC68-3311714A69AD" ++ (* Microsoft Reserved Partition. *) ++ | "E3C9E316-0B5C-4DB8-817D-F92DF00215AE" ++ (* Windows Snapshot Partition. *) ++ | "CADDEBF1-4400-4DE8-B103-12117DCF3CCF" -> false + | _ -> true +- ) +- ) +- else true ++ ) + +-and is_mbr_extended parttype device partnum = +- parttype = "msdos" && +- Parted.part_get_mbr_part_type device partnum = "extended" +- +-and is_mbr_bogus parttype device partnum = +- parttype = "msdos" && partnum = 1 && Utils.has_bogus_mbr device ++ | _ -> (* unknown or other *) ++ true + + (* Use vfs-type to check for a filesystem of some sort of [device]. + * Appends (device, vfs_type) to the ret parameter (there may be +-- +2.47.3 + diff --git a/0006-daemon-listfs.ml-Ignore-CHS-geometry-error-from-part.patch b/0006-daemon-listfs.ml-Ignore-CHS-geometry-error-from-part.patch new file mode 100644 index 0000000..097afc4 --- /dev/null +++ b/0006-daemon-listfs.ml-Ignore-CHS-geometry-error-from-part.patch @@ -0,0 +1,114 @@ +From 219211f090536a8f6aa1919930284a439880c815 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 16 Apr 2026 08:34:38 +0100 +Subject: [PATCH] daemon/listfs.ml: Ignore CHS geometry error from parted +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +parted has an annoying bug where it fails to parse Sun partition +tables (still used by Veritas). It tries to check the CHS geometry +stored in the header matches the physical CHS geometry, which is a +meaningless test. + +In function is_partition_can_hold_filesystem we are only interested in +MBR and GPT partition types, so catch and ignore this specific parted +error. + +I tested this by adding a Sun disk as a second disk to a Fedora +guest and doing inspection. Previously the operation would +fail: + + $ guestfish --ro -a /var/tmp/fedora-41.img -a /var/tmp/dump.img -i + libguestfs: error: inspect_os: parted exited with status 1: Warning: + The disk CHS geometry (205603,255,2) reported by the operating + system does not match the geometry stored on the disk label + (64887,16,101). + +After this change it succeeds: + + $ guestfish --ro -a /var/tmp/fedora-41.img -a /var/tmp/dump.img -i + + Welcome to guestfish, the guest filesystem shell for + editing virtual machine filesystems and disk images. + + Type: ‘help’ for help on commands + ‘man’ to read the manual + ‘quit’ to quit the shell + + Operating system: Fedora Linux 41 (Forty One) + /dev/sda3 mounted on / + /dev/sda2 mounted on /boot + +Fixes: https://redhat.atlassian.net/browse/RHEL-165220 +(cherry picked from commit 8d83bf2bcf31c5206b6deaa5e993009a85ff174f) +--- + daemon/listfs.ml | 44 ++++++++++++++++++++++++++++---------------- + 1 file changed, 28 insertions(+), 16 deletions(-) + +diff --git a/daemon/listfs.ml b/daemon/listfs.ml +index 067314c47..8ca5ca8a8 100644 +--- a/daemon/listfs.ml ++++ b/daemon/listfs.ml +@@ -118,30 +118,42 @@ and is_partition_can_hold_filesystem partition = + let device = Devsparts.part_to_dev partition + and partnum = Devsparts.part_to_partnum partition in + +- match Parted.part_get_parttype device with +- | "msdos" -> +- if Parted.part_get_mbr_part_type device partnum = "extended" then +- false +- else if partnum = 1 && Utils.has_bogus_mbr device then +- true +- else +- true ++ try ++ match Parted.part_get_parttype device with ++ | "msdos" -> ++ if Parted.part_get_mbr_part_type device partnum = "extended" then ++ false ++ else if partnum = 1 && Utils.has_bogus_mbr device then ++ true ++ else ++ true + +- | "gpt" -> +- let gpt_type = Sfdisk.part_get_gpt_type device partnum in +- (match gpt_type with +- (* Windows Logical Disk Manager metadata partition. *) +- | "5808C8AA-7E8F-42E0-85D2-E1E90434CFB3" ++ | "gpt" -> ++ let gpt_type = Sfdisk.part_get_gpt_type device partnum in ++ (match gpt_type with ++ (* Windows Logical Disk Manager metadata partition. *) ++ | "5808C8AA-7E8F-42E0-85D2-E1E90434CFB3" + (* Windows Logical Disk Manager data partition. *) + | "AF9B60A0-1431-4F62-BC68-3311714A69AD" + (* Microsoft Reserved Partition. *) + | "E3C9E316-0B5C-4DB8-817D-F92DF00215AE" + (* Windows Snapshot Partition. *) + | "CADDEBF1-4400-4DE8-B103-12117DCF3CCF" -> false +- | _ -> true +- ) ++ | _ -> true ++ ) + +- | _ -> (* unknown or other *) ++ | _ -> (* unknown or other *) ++ true ++ ++ with ++ | Failure msg when String.find msg "CHS geometry" >= 0 -> ++ (* Parted has poor handling of "sun" partition types, always ++ * issuing a warning because the CHS doesn't match the physical ++ * geometry. Ignore this as we don't care about it in this ++ * function (RHEL-165220). ++ *) ++ eprintf "is_partition_can_hold_filesystem: \ ++ ignoring warning from parted: %s\n%!" msg; + true + + (* Use vfs-type to check for a filesystem of some sort of [device]. +-- +2.47.3 + diff --git a/libguestfs.spec b/libguestfs.spec index e70829d..04d5f6c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -35,7 +35,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.59.5 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -77,6 +77,8 @@ Patch0001: 0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch Patch0002: 0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch Patch0003: 0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch Patch0004: 0004-RHEL-Use-alternate-location-for-qemu-kvm-in-direct-b.patch +Patch0005: 0005-daemon-listfs.ml-Refactor-is_partition_can_hold_file.patch +Patch0006: 0006-daemon-listfs.ml-Ignore-CHS-geometry-error-from-part.patch BuildRequires: autoconf, automake, libtool, gettext-devel @@ -1028,12 +1030,14 @@ rm ocaml/html/.gitignore %changelog -* Thu Apr 02 2026 Richard W.M. Jones - 1:1.59.5-1 +* Thu Apr 16 2026 Richard W.M. Jones - 1:1.59.5-2 - Rebase to libguestfs 1.59.5 Synchronize spec file with Fedora resolves: RHEL-153358 - Detect Windows Defender antivirus resolves: RHEL-129145 +- Fix CHS geometry error for Veritas/Sun partitions + resolves: RHEL-165220 * Mon Jan 26 2026 Richard W.M. Jones - 1:1.58.1-2 - Rebase to libguestfs 1.58.1 From 0ff906006544f446704c61e5d1525495bbd77732 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 17 Apr 2026 12:21:21 +0100 Subject: [PATCH 2/2] Rebase to libguestfs 1.59.6 resolves: RHEL-153358 --- ...upported-remote-drive-protocols-RHBZ.patch | 4 +- ...of-libguestfs-winsupport-features-ex.patch | 2 +- ...nit-Run-depmod-a-to-rebuild-kernel-m.patch | 6 +- ...te-location-for-qemu-kvm-in-direct-b.patch | 2 +- ...-Refactor-is_partition_can_hold_file.patch | 87 ------------- ...-Ignore-CHS-geometry-error-from-part.patch | 114 ------------------ libguestfs.spec | 10 +- sources | 4 +- 8 files changed, 13 insertions(+), 216 deletions(-) delete mode 100644 0005-daemon-listfs.ml-Refactor-is_partition_can_hold_file.patch delete mode 100644 0006-daemon-listfs.ml-Ignore-CHS-geometry-error-from-part.patch diff --git a/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch b/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch index d014993..fb6b38d 100644 --- a/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch +++ b/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch @@ -1,4 +1,4 @@ -From b0aecd2b8c6a1ea12a30c534641126e0f2a0b176 Mon Sep 17 00:00:00 2001 +From 2e8adc07849af98fbbbd32fb353a19626bce0098 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Jul 2013 14:47:56 +0100 Subject: [PATCH] RHEL: Disable unsupported remote drive protocols @@ -180,7 +180,7 @@ index e4e1021db..8419ce78a 100755 rm test-add-uri.out rm test-add-uri.img diff --git a/generator/actions_core.ml b/generator/actions_core.ml -index 3889e0215..c198b8206 100644 +index 251b4a906..5b5dbbbfb 100644 --- a/generator/actions_core.ml +++ b/generator/actions_core.ml @@ -343,22 +343,6 @@ F is interpreted as a local file or device. diff --git a/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch b/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch index 3f1d920..a51f85a 100644 --- a/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch +++ b/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch @@ -1,4 +1,4 @@ -From 34256ecfaabca8abe8e886f0f72e0991dec66e3e Mon Sep 17 00:00:00 2001 +From 9b06df8322a1099b2126c1f85bff2dce9c1d59ec Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Jul 2015 09:28:03 -0400 Subject: [PATCH] RHEL: Reject use of libguestfs-winsupport features except for diff --git a/0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch b/0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch index 156c90d..9452976 100644 --- a/0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch +++ b/0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch @@ -1,4 +1,4 @@ -From a775d13e9390814f22c3ae6097096885b8236d4e Mon Sep 17 00:00:00 2001 +From 95665d0421c764e22f0a5ed25ccabc900651ac17 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 13 May 2025 17:28:25 +0100 Subject: [PATCH] RHEL: appliance/init: Run depmod -a to rebuild kernel module @@ -9,10 +9,10 @@ Subject: [PATCH] RHEL: appliance/init: Run depmod -a to rebuild kernel module 1 file changed, 3 insertions(+) diff --git a/appliance/init b/appliance/init -index 67955b024..e8d8f616c 100755 +index 222c14667..0c74183eb 100755 --- a/appliance/init +++ b/appliance/init -@@ -120,6 +120,9 @@ udevadm trigger +@@ -117,6 +117,9 @@ udevadm trigger udevadm settle --timeout=600 #udevadm monitor -p & diff --git a/0004-RHEL-Use-alternate-location-for-qemu-kvm-in-direct-b.patch b/0004-RHEL-Use-alternate-location-for-qemu-kvm-in-direct-b.patch index 7c895bc..4c565e0 100644 --- a/0004-RHEL-Use-alternate-location-for-qemu-kvm-in-direct-b.patch +++ b/0004-RHEL-Use-alternate-location-for-qemu-kvm-in-direct-b.patch @@ -1,4 +1,4 @@ -From 991ad10b965e4975903bce781ab23be4c5645d8e Mon Sep 17 00:00:00 2001 +From 6b02ae26e69cd01388de1a7016dca0cff8d774fc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 17 Mar 2026 20:14:16 +0000 Subject: [PATCH] RHEL: Use alternate location for qemu-kvm in direct backend diff --git a/0005-daemon-listfs.ml-Refactor-is_partition_can_hold_file.patch b/0005-daemon-listfs.ml-Refactor-is_partition_can_hold_file.patch deleted file mode 100644 index 48599e3..0000000 --- a/0005-daemon-listfs.ml-Refactor-is_partition_can_hold_file.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 6a27009836aa3ae0883144cc662559fd1bcdcb66 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 16 Apr 2026 08:06:50 +0100 -Subject: [PATCH] daemon/listfs.ml: Refactor is_partition_can_hold_filesystem - -Refactor and simplify the function. - -This is just code motion, there is no functional change. - -(cherry picked from commit 88bd07f350407619d4f5fe406c5594b50cf541dd) ---- - daemon/listfs.ml | 53 ++++++++++++++++++++---------------------------- - 1 file changed, 22 insertions(+), 31 deletions(-) - -diff --git a/daemon/listfs.ml b/daemon/listfs.ml -index 4c90796ef..067314c47 100644 ---- a/daemon/listfs.ml -+++ b/daemon/listfs.ml -@@ -115,43 +115,34 @@ and is_not_partitioned_device device = - * Windows Snapshot Partition as well as MBR extended partitions. - *) - and is_partition_can_hold_filesystem partition = -- let device = Devsparts.part_to_dev partition in -- let partnum = Devsparts.part_to_partnum partition in -- let parttype = Parted.part_get_parttype device in -+ let device = Devsparts.part_to_dev partition -+ and partnum = Devsparts.part_to_partnum partition in - -- let is_gpt = parttype = "gpt" in -- let is_mbr = parttype = "msdos" in -- let is_gpt_or_mbr = is_gpt || is_mbr in -+ match Parted.part_get_parttype device with -+ | "msdos" -> -+ if Parted.part_get_mbr_part_type device partnum = "extended" then -+ false -+ else if partnum = 1 && Utils.has_bogus_mbr device then -+ true -+ else -+ true - -- if is_gpt_or_mbr then ( -- if is_mbr_extended parttype device partnum then -- false -- else if is_mbr_bogus parttype device partnum then -- true -- else if is_mbr then -- true -- else ( -- let gpt_type = Sfdisk.part_get_gpt_type device partnum in -- match gpt_type with -+ | "gpt" -> -+ let gpt_type = Sfdisk.part_get_gpt_type device partnum in -+ (match gpt_type with - (* Windows Logical Disk Manager metadata partition. *) - | "5808C8AA-7E8F-42E0-85D2-E1E90434CFB3" -- (* Windows Logical Disk Manager data partition. *) -- | "AF9B60A0-1431-4F62-BC68-3311714A69AD" -- (* Microsoft Reserved Partition. *) -- | "E3C9E316-0B5C-4DB8-817D-F92DF00215AE" -- (* Windows Snapshot Partition. *) -- | "CADDEBF1-4400-4DE8-B103-12117DCF3CCF" -> false -+ (* Windows Logical Disk Manager data partition. *) -+ | "AF9B60A0-1431-4F62-BC68-3311714A69AD" -+ (* Microsoft Reserved Partition. *) -+ | "E3C9E316-0B5C-4DB8-817D-F92DF00215AE" -+ (* Windows Snapshot Partition. *) -+ | "CADDEBF1-4400-4DE8-B103-12117DCF3CCF" -> false - | _ -> true -- ) -- ) -- else true -+ ) - --and is_mbr_extended parttype device partnum = -- parttype = "msdos" && -- Parted.part_get_mbr_part_type device partnum = "extended" -- --and is_mbr_bogus parttype device partnum = -- parttype = "msdos" && partnum = 1 && Utils.has_bogus_mbr device -+ | _ -> (* unknown or other *) -+ true - - (* Use vfs-type to check for a filesystem of some sort of [device]. - * Appends (device, vfs_type) to the ret parameter (there may be --- -2.47.3 - diff --git a/0006-daemon-listfs.ml-Ignore-CHS-geometry-error-from-part.patch b/0006-daemon-listfs.ml-Ignore-CHS-geometry-error-from-part.patch deleted file mode 100644 index 097afc4..0000000 --- a/0006-daemon-listfs.ml-Ignore-CHS-geometry-error-from-part.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 219211f090536a8f6aa1919930284a439880c815 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 16 Apr 2026 08:34:38 +0100 -Subject: [PATCH] daemon/listfs.ml: Ignore CHS geometry error from parted -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -parted has an annoying bug where it fails to parse Sun partition -tables (still used by Veritas). It tries to check the CHS geometry -stored in the header matches the physical CHS geometry, which is a -meaningless test. - -In function is_partition_can_hold_filesystem we are only interested in -MBR and GPT partition types, so catch and ignore this specific parted -error. - -I tested this by adding a Sun disk as a second disk to a Fedora -guest and doing inspection. Previously the operation would -fail: - - $ guestfish --ro -a /var/tmp/fedora-41.img -a /var/tmp/dump.img -i - libguestfs: error: inspect_os: parted exited with status 1: Warning: - The disk CHS geometry (205603,255,2) reported by the operating - system does not match the geometry stored on the disk label - (64887,16,101). - -After this change it succeeds: - - $ guestfish --ro -a /var/tmp/fedora-41.img -a /var/tmp/dump.img -i - - Welcome to guestfish, the guest filesystem shell for - editing virtual machine filesystems and disk images. - - Type: ‘help’ for help on commands - ‘man’ to read the manual - ‘quit’ to quit the shell - - Operating system: Fedora Linux 41 (Forty One) - /dev/sda3 mounted on / - /dev/sda2 mounted on /boot - -Fixes: https://redhat.atlassian.net/browse/RHEL-165220 -(cherry picked from commit 8d83bf2bcf31c5206b6deaa5e993009a85ff174f) ---- - daemon/listfs.ml | 44 ++++++++++++++++++++++++++++---------------- - 1 file changed, 28 insertions(+), 16 deletions(-) - -diff --git a/daemon/listfs.ml b/daemon/listfs.ml -index 067314c47..8ca5ca8a8 100644 ---- a/daemon/listfs.ml -+++ b/daemon/listfs.ml -@@ -118,30 +118,42 @@ and is_partition_can_hold_filesystem partition = - let device = Devsparts.part_to_dev partition - and partnum = Devsparts.part_to_partnum partition in - -- match Parted.part_get_parttype device with -- | "msdos" -> -- if Parted.part_get_mbr_part_type device partnum = "extended" then -- false -- else if partnum = 1 && Utils.has_bogus_mbr device then -- true -- else -- true -+ try -+ match Parted.part_get_parttype device with -+ | "msdos" -> -+ if Parted.part_get_mbr_part_type device partnum = "extended" then -+ false -+ else if partnum = 1 && Utils.has_bogus_mbr device then -+ true -+ else -+ true - -- | "gpt" -> -- let gpt_type = Sfdisk.part_get_gpt_type device partnum in -- (match gpt_type with -- (* Windows Logical Disk Manager metadata partition. *) -- | "5808C8AA-7E8F-42E0-85D2-E1E90434CFB3" -+ | "gpt" -> -+ let gpt_type = Sfdisk.part_get_gpt_type device partnum in -+ (match gpt_type with -+ (* Windows Logical Disk Manager metadata partition. *) -+ | "5808C8AA-7E8F-42E0-85D2-E1E90434CFB3" - (* Windows Logical Disk Manager data partition. *) - | "AF9B60A0-1431-4F62-BC68-3311714A69AD" - (* Microsoft Reserved Partition. *) - | "E3C9E316-0B5C-4DB8-817D-F92DF00215AE" - (* Windows Snapshot Partition. *) - | "CADDEBF1-4400-4DE8-B103-12117DCF3CCF" -> false -- | _ -> true -- ) -+ | _ -> true -+ ) - -- | _ -> (* unknown or other *) -+ | _ -> (* unknown or other *) -+ true -+ -+ with -+ | Failure msg when String.find msg "CHS geometry" >= 0 -> -+ (* Parted has poor handling of "sun" partition types, always -+ * issuing a warning because the CHS doesn't match the physical -+ * geometry. Ignore this as we don't care about it in this -+ * function (RHEL-165220). -+ *) -+ eprintf "is_partition_can_hold_filesystem: \ -+ ignoring warning from parted: %s\n%!" msg; - true - - (* Use vfs-type to check for a filesystem of some sort of [device]. --- -2.47.3 - diff --git a/libguestfs.spec b/libguestfs.spec index 04d5f6c..a159360 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -34,8 +34,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.59.5 -Release: 2%{?dist} +Version: 1.59.6 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -77,8 +77,6 @@ Patch0001: 0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch Patch0002: 0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch Patch0003: 0003-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch Patch0004: 0004-RHEL-Use-alternate-location-for-qemu-kvm-in-direct-b.patch -Patch0005: 0005-daemon-listfs.ml-Refactor-is_partition_can_hold_file.patch -Patch0006: 0006-daemon-listfs.ml-Ignore-CHS-geometry-error-from-part.patch BuildRequires: autoconf, automake, libtool, gettext-devel @@ -1030,8 +1028,8 @@ rm ocaml/html/.gitignore %changelog -* Thu Apr 16 2026 Richard W.M. Jones - 1:1.59.5-2 -- Rebase to libguestfs 1.59.5 +* Fri Apr 17 2026 Richard W.M. Jones - 1:1.59.6-1 +- Rebase to libguestfs 1.59.6 Synchronize spec file with Fedora resolves: RHEL-153358 - Detect Windows Defender antivirus diff --git a/sources b/sources index d4d0772..e425c6e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.59.5.tar.gz) = 3b87978716cfecbf029ffe8f8945b6af85cb47968c9a6f92908dfb00875bf1b52d12894da1085a81f8fbc7fbd51f368b2ae811c1519a6b4855644eb34b5d15b1 -SHA512 (libguestfs-1.59.5.tar.gz.sig) = a5b11927a3cd8ec22443d5d38136c079fd558964b21f9532abd2fbd4e27cbf56707520e57395683e12d1b13bbb2740e6a1fffde854259e7c1fa71ac39e7efbfa +SHA512 (libguestfs-1.59.6.tar.gz) = e3e2d965a89ad22b239f5215d1966548f2bc705b0633821c5d34f4d303cd92b611f8f5a3572e7a13670b055e5e108baa99999842c92bde6917cf496a58cf2638 +SHA512 (libguestfs-1.59.6.tar.gz.sig) = b5037a003056e718388d4b2699cc0d083e9dba7c4ca5d972b444c5b34a53570f28572400ca1df87a3baf53fd04a8e04560f86840261625e58bbc87a3a6b734a7