mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: move Mount.umount_all to new Mount_utils module

Browse Source 
This way the Mount module contains only the OCaml implementations of
mount-related daemon APIs.

This is simple refactoring, with no functional changes.

(cherry picked from commit 6c13d2356e)
This commit is contained in:
Pino Toscano
2018-04-09 17:07:57 +02:00
committed by Richard W.M. Jones
parent 07d5202751
commit 0644f894ea
7 changed files with 106 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/Makefile.am
View File

@@ -271,6 +271,7 @@ SOURCES_MLI = \
lvm_utils.mli \
md.mli \
mount.mli \
mount_utils.mli \
mountable.mli \
optgroups.mli \
parted.mli \
@@ -301,6 +302,7 @@ SOURCES_ML = \
findfs.ml \
md.ml \
mount.ml \
mount_utils.ml \
parted.ml \
listfs.ml \
realpath.ml \

2
daemon/inspect.ml
View File

@@ -27,7 +27,7 @@ open Inspect_types
let re_primary_partition = PCRE.compile "^/dev/(?:h|s|v)d.[1234]$"
let rec inspect_os () =
Mount.umount_all ();
Mount_utils.umount_all ();
(* Iterate over all detected filesystems. Inspect each one in turn. *)
let fses = Listfs.list_filesystems () in

2
daemon/inspect_fs.ml
View File

@@ -55,7 +55,7 @@ let rec check_for_filesystem_on mountable vfs_type =
if not mounted then None
else (
let role = check_filesystem mountable in
Mount.umount_all ();
Mount_utils.umount_all ();
role
)
) in

61
daemon/mount.ml
View File

@@ -60,64 +60,3 @@ let mount_vfs options vfs mountable mountpoint =
let mount = mount_vfs "" ""
let mount_ro = mount_vfs "ro" ""
let mount_options options = mount_vfs options ""
(* Unmount everything mounted under /sysroot.
*
* We have to unmount in the correct order, so we sort the paths by
* longest first to ensure that child paths are unmounted by parent
* paths.
*
* This call is more important than it appears at first, because it
* is widely used by both test and production code in order to
* get back to a known state (nothing mounted, everything synchronized).
*)
let rec umount_all () =
(* This is called from internal_autosync and generally as a cleanup
* function, and since the umount will definitely fail if any
* handles are open, we may as well close them.
*)
(* XXX
aug_finalize ();
hivex_finalize ();
journal_finalize ();
*)
let sysroot = Sysroot.sysroot () in
let sysroot_len = String.length sysroot in
let info = read_whole_file "/proc/self/mountinfo" in
let info = String.nsplit "\n" info in
let mps = ref [] in
List.iter (
fun line ->
let line = String.nsplit " " line in
(* The field of interest is the 5th field. Whitespace is escaped
* with octal sequences like \040 (for space).
* See fs/seq_file.c:mangle_path.
*)
if List.length line >= 5 then (
let mp = List.nth line 4 in
let mp = proc_unmangle_path mp in
(* Allow a mount directory like "/sysroot" or "/sysroot/..." *)
if (sysroot_len > 0 && String.is_prefix mp sysroot) ||
(String.is_prefix mp sysroot &&
String.length mp > sysroot_len &&
mp.[sysroot_len] = '/') then
List.push_front mp mps
)
) info;
let mps = !mps in
let mps = List.sort compare_longest_first mps in
(* Unmount them. *)
List.iter (
fun mp -> ignore (command "umount" [mp])
) mps
and compare_longest_first s1 s2 =
let n1 = String.length s1 in
let n2 = String.length s2 in
n2 - n1

2
daemon/mount.mli
View File

@@ -20,5 +20,3 @@ val mount : Mountable.t -> string -> unit
val mount_ro : Mountable.t -> string -> unit
val mount_options : string -> Mountable.t -> string -> unit
val mount_vfs : string -> string -> Mountable.t -> string -> unit
val umount_all : unit -> unit

83
daemon/mount_utils.ml Normal file
View File

@@ -0,0 +1,83 @@
(* guestfs-inspection
* Copyright (C) 2009-2018 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
open Std_utils
open Mountable
open Utils
(* Unmount everything mounted under /sysroot.
*
* We have to unmount in the correct order, so we sort the paths by
* longest first to ensure that child paths are unmounted by parent
* paths.
*
* This call is more important than it appears at first, because it
* is widely used by both test and production code in order to
* get back to a known state (nothing mounted, everything synchronized).
*)
let rec umount_all () =
(* This is called from internal_autosync and generally as a cleanup
* function, and since the umount will definitely fail if any
* handles are open, we may as well close them.
*)
(* XXX
aug_finalize ();
hivex_finalize ();
journal_finalize ();
*)
let sysroot = Sysroot.sysroot () in
let sysroot_len = String.length sysroot in
let info = read_whole_file "/proc/self/mountinfo" in
let info = String.nsplit "\n" info in
let mps = ref [] in
List.iter (
fun line ->
let line = String.nsplit " " line in
(* The field of interest is the 5th field. Whitespace is escaped
* with octal sequences like \040 (for space).
* See fs/seq_file.c:mangle_path.
*)
if List.length line >= 5 then (
let mp = List.nth line 4 in
let mp = proc_unmangle_path mp in
(* Allow a mount directory like "/sysroot" or "/sysroot/..." *)
if (sysroot_len > 0 && String.is_prefix mp sysroot) ||
(String.is_prefix mp sysroot &&
String.length mp > sysroot_len &&
mp.[sysroot_len] = '/') then
List.push_front mp mps
)
) info;
let mps = !mps in
let mps = List.sort compare_longest_first mps in
(* Unmount them. *)
List.iter (
fun mp -> ignore (command "umount" [mp])
) mps
and compare_longest_first s1 s2 =
let n1 = String.length s1 in
let n2 = String.length s2 in
n2 - n1

19
daemon/mount_utils.mli Normal file
View File

@@ -0,0 +1,19 @@
(* guestfs-inspection
* Copyright (C) 2009-2018 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
val umount_all : unit -> unit