rpms/libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- daemon: part_get_gpt_type: Remove unhelpful MBR fallback

Browse Source 
behaviour
This commit is contained in:
eabdullin 2024-09-04 11:36:23 +03:00
parent e938253f66
commit d06c36a3e0
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
SOURCES/0040-daemon-part_get_gpt_type-Remove-unhelpful-MBR-fallback.patch Normal file
View File

@ -0,0 +1,43 @@
From 2811e42b436c94392c2722bbf4b19299285a6254 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 10 May 2024 15:23:35 +0100
Subject: [PATCH] daemon: part_get_gpt_type: Remove unhelpful MBR fallback
behaviour
This was an accident of the parted implementation, and wasn't really
used anywhere. Remove it.
---
daemon/listfs.ml | 3 ++-
generator/actions_core.ml | 4 +---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/daemon/listfs.ml b/daemon/listfs.ml
index 2376b61db..4cc3c437a 100644
--- a/daemon/listfs.ml
+++ b/daemon/listfs.ml
@@ -111,8 +111,9 @@ and is_partition_can_hold_filesystem partition =
false
else if is_mbr_bogus parttype device partnum then
true
+ else if is_mbr then
+ true
else (
- (* MBR partition id will be converted into corresponding GPT type. *)
let gpt_type = Parted.part_get_gpt_type device partnum in
match gpt_type with
(* Windows Logical Disk Manager metadata partition. *)
diff --git a/generator/actions_core.ml b/generator/actions_core.ml
index 4f78a0d26..935e59eab 100644
--- a/generator/actions_core.ml
+++ b/generator/actions_core.ml
@@ -8118,9 +8118,7 @@ for a useful list of type GUIDs." };
];
shortdesc = "get the type GUID of a GPT partition";
longdesc = "\
-Return the type GUID of numbered GPT partition C<partnum>. For MBR partitions,
-return an appropriate GUID corresponding to the MBR type. Behaviour is undefined
-for other partition types." };
+Return the type GUID of numbered GPT partition C<partnum>." };
{ defaults with
name = "part_set_gpt_attributes"; added = (1, 21, 1);

12
SPECS/libguestfs.spec
View File

@ -45,7 +45,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.50.1
Release: 7%{?dist}.alma.1
Release: 80%{?dist}.alma.1
License: LGPLv2+
# Build only for architectures that have a kernel
@ -131,6 +131,10 @@ Patch0037: 0037-ocaml-Nullify-custom-block-before-releasing-runtime-.patch
Patch0038: 0038-Update-common-submodule.patch
Patch0039: 0039-tests-Test-guestfish-key-all-.-selector.patch
# Patches were taken from:
# https://github.com/libguestfs/libguestfs/commit/2811e42b436c94392c2722bbf4b19299285a6254
Patch0040: 0040-daemon-part_get_gpt_type-Remove-unhelpful-MBR-fallback.patch
%if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool, gettext-devel
%endif
@ -1136,7 +1140,11 @@ rm ocaml/html/.gitignore
%changelog
* Thu Mar 28 2024 Edaurd Abdullin <eabdullin@almalinux.org> - 1:1.50.1-7.alma.1
* Wed Sep 04 2024 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.50.1-8.alma.1
- daemon: part_get_gpt_type: Remove unhelpful MBR fallback
behaviour
* Thu Mar 28 2024 Eduard Abdullin <eabdullin@almalinux.org> - 1:1.50.1-7.alma.1
- Fix build for AlmaLinux
- Avoid permission denied for yum/dnf cache