forked from pool/libguestfs
66ebbfaafa
004-Add-more-debugging-to-list_filesystems.patch 005-Pipeline-style-when-mapping-and-filtering-filesystems.patch 007-inspection-Ignore-btrfs-snapshots-of-roots.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=621
133 lines
4.2 KiB
Diff
133 lines
4.2 KiB
Diff
Subject: daemon/listfs.ml: Add more debugging to list_filesystems
|
|
From: Richard W.M. Jones rjones@redhat.com Thu May 22 10:03:32 2025 +0100
|
|
Date: Tue May 27 17:01:09 2025 +0100:
|
|
Git: 7ac190ed20e7a2f8e664a4994e5508f050ed12e8
|
|
|
|
This function is used from other parts of the daemon, especially for
|
|
example with inspection. However it was difficult to follow exactly
|
|
what filesystems it was returning because of insufficient debugging
|
|
information.
|
|
|
|
diff --git a/daemon/listfs.ml b/daemon/listfs.ml
|
|
index 0139e927d..4c90796ef 100644
|
|
--- a/daemon/listfs.ml
|
|
+++ b/daemon/listfs.ml
|
|
@@ -25,12 +25,17 @@ open Std_utils
|
|
* contain filesystems, so we filter them out.
|
|
*)
|
|
let rec list_filesystems () =
|
|
+ if verbose () then
|
|
+ eprintf "list_filesystems: start\n";
|
|
+
|
|
let has_lvm2 = Optgroups.lvm2_available () in
|
|
let has_ldm = Optgroups.ldm_available () in
|
|
|
|
- let ret = ref [] in
|
|
+ let ret : (Mountable.t * string) list ref = ref [] in
|
|
|
|
(* Devices. *)
|
|
+ if verbose () then
|
|
+ eprintf "list_filesystems: checking for whole devices\n";
|
|
let devices = Devsparts.list_devices () in
|
|
let devices = List.filter is_not_partitioned_device devices in
|
|
List.iter (check_with_vfs_type ret) devices;
|
|
@@ -39,32 +44,44 @@ let rec list_filesystems () =
|
|
* We include these in case any encrypted devices contain
|
|
* direct filesystems.
|
|
*)
|
|
+ if verbose () then
|
|
+ eprintf "list_filesystems: checking for device-mapper devices\n";
|
|
let devices = Lvm_dm.list_dm_devices () in
|
|
let devices = List.filter is_not_partitioned_device devices in
|
|
List.iter (check_with_vfs_type ret) devices;
|
|
|
|
(* Partitions. *)
|
|
+ if verbose () then
|
|
+ eprintf "list_filesystems: checking for partitions\n";
|
|
let partitions = Devsparts.list_partitions () in
|
|
let partitions = List.filter is_partition_can_hold_filesystem partitions in
|
|
List.iter (check_with_vfs_type ret) partitions;
|
|
|
|
(* MD. *)
|
|
+ if verbose () then
|
|
+ eprintf "list_filesystems: checking for MD devices\n";
|
|
let mds = Md.list_md_devices () in
|
|
let mds = List.filter is_not_partitioned_device mds in
|
|
List.iter (check_with_vfs_type ret) mds;
|
|
|
|
(* LVM. *)
|
|
if has_lvm2 then (
|
|
+ if verbose () then
|
|
+ eprintf "list_filesystems: checking for logical volumes\n";
|
|
let lvs = Lvm.lvs () in
|
|
List.iter (check_with_vfs_type ret) lvs
|
|
);
|
|
|
|
(* LDM. *)
|
|
if has_ldm then (
|
|
+ if verbose () then
|
|
+ eprintf "list_filesystems: checking for LDM volumes\n";
|
|
let ldmvols = Ldm.list_ldm_volumes () in
|
|
List.iter (check_with_vfs_type ret) ldmvols
|
|
);
|
|
|
|
+ if verbose () then
|
|
+ eprintf "list_filesystems: finished\n%!";
|
|
!ret
|
|
|
|
(* Look to see if device can directly contain filesystem (RHBZ#590167).
|
|
@@ -146,12 +163,15 @@ and check_with_vfs_type ret device =
|
|
try Blkid.vfs_type mountable
|
|
with exn ->
|
|
if verbose () then
|
|
- eprintf "check_with_vfs_type: %s: %s\n"
|
|
+ eprintf "list_filesystems: check_with_vfs_type: %s: %s\n"
|
|
device (Printexc.to_string exn);
|
|
"" in
|
|
|
|
- if vfs_type = "" then
|
|
- List.push_back ret (mountable, "unknown")
|
|
+ if vfs_type = "" then (
|
|
+ let fs = mountable, "unknown" in
|
|
+ debug_one_fs fs;
|
|
+ List.push_back ret fs
|
|
+ )
|
|
|
|
(* Ignore all "*_member" strings. In libblkid these are returned
|
|
* for things which are members of some RAID or LVM set, most
|
|
@@ -179,17 +199,30 @@ and check_with_vfs_type ret device =
|
|
) vols in
|
|
|
|
(* whole device = default volume *)
|
|
- List.push_back ret (mountable, vfs_type);
|
|
+ let fs = mountable, vfs_type in
|
|
+ debug_one_fs fs;
|
|
+ List.push_back ret fs;
|
|
|
|
(* subvolumes *)
|
|
List.push_back_list ret (
|
|
List.map (
|
|
fun { Structs.btrfssubvolume_path = path } ->
|
|
let mountable = Mountable.of_btrfsvol device path in
|
|
- (mountable, "btrfs")
|
|
+ let fs = mountable, "btrfs" in
|
|
+ debug_one_fs fs;
|
|
+ fs
|
|
) vols
|
|
)
|
|
)
|
|
|
|
- else
|
|
- List.push_back ret (mountable, vfs_type)
|
|
+ (* Otherwise it's some other VFS type. *)
|
|
+ else (
|
|
+ let fs = mountable, vfs_type in
|
|
+ debug_one_fs fs;
|
|
+ List.push_back ret fs
|
|
+ )
|
|
+
|
|
+and debug_one_fs (mountable, vfs_type) =
|
|
+ if verbose () then
|
|
+ eprintf "list_filesystems: adding %S, %S\n"
|
|
+ (Mountable.to_string mountable) vfs_type
|