12:48 p.m.
From: Mikhail Gordeev <obirvalger(a)altlinux.org>
---
v2v/convert_linux.ml | 49 +++++++++++++++++++++++++++++++++++++++++++
v2v/convert_linux.mli | 2 +-
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index a871d754f4..5ae83a2f66 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -52,6 +52,7 @@ let convert (g : G.guestfs) inspect source_disks output rcaps _ =
| "rhel" | "centos" | "scientificlinux" |
"redhat-based"
| "oraclelinux" -> `RHEL_family
| "sles" | "suse-based" | "opensuse" ->
`SUSE_family
+ | "altlinux" -> `ALT_family
| "debian" | "ubuntu" | "linuxmint" |
"kalilinux" -> `Debian_family
| _ -> assert false in
@@ -372,6 +373,9 @@ let convert (g : G.guestfs) inspect source_disks output rcaps _ =
);
) libraries
)
+ else if family = `ALT_family then (
+ remove := libraries
+ )
);
let remove = !remove in
@@ -657,6 +661,50 @@ let convert (g : G.guestfs) inspect source_disks output rcaps _ =
run_update_initramfs_command ()
)
+ else if family = `ALT_family then (
+ (* ALT utilities to work with initrd does not support adding modules
+ * to an existing initrd
+ *)
+ let kver = kernel.ki_version in
+ let kmodpath = kernel.ki_modpath in
+
+ (* find module files *)
+ let files = g#find kmodpath |> Array.to_list in
+ let test f =
+ let r m = sprintf ".*/%s\\.ko$" m |> Str.regexp in
+ let rmodules = List.map r modules in
+ let fold_f acc mr = acc || Str.string_match mr f 0 in
+ List.fold_left fold_f false rmodules in
+ let files = List.filter test files in
+
+ (* create new initrd with contents of old initrd *)
+ let tmpdir = g#mkdtemp "/tmp/new_initrd-XXXXXX" in
+ let old_initrd = initrd ^ ".pre-v2v" in
+ let cmd = sprintf "gzip -cd %s | cpio -imd --quiet -D %s"
+ old_initrd tmpdir in
+ ignore (g#sh cmd);
+
+ (* copy module files to new initrd *)
+ List.iter (fun file ->
+ let dir_name = Filename.dirname file in
+ let dir_name = sprintf "%s%s%s" tmpdir kmodpath dir_name in
+ g#mkdir_p dir_name;
+ g#cp (sprintf "%s/%s" kmodpath file) dir_name
+ ) files;
+
+ (* find module dependencies *)
+ let cmd = [|"/sbin/depmod"; "-a"; "-F";
"/boot/System.map-" ^ kver;
+ "-b"; tmpdir; kver|] in
+ ignore (g#command cmd);
+
+ (* archive files to initrd *)
+ let cmd =
+ sprintf "cd %s; find . | cpio --quiet -H newc -o | gzip -9 -n >
%s"
+ tmpdir initrd in
+ ignore (g#sh cmd);
+
+ g#rm_rf tmpdir;
+ )
else if g#is_file ~followsymlinks:true "/sbin/mkinitrd" then (
let module_args = List.map (sprintf "--with=%s") modules in
let args =
@@ -1233,6 +1281,7 @@ let () =
| "rhel" | "centos" | "scientificlinux"
| "redhat-based"
| "oraclelinux"
| "sles" | "suse-based" | "opensuse"
+ | "altlinux"
| "debian" | "ubuntu" | "linuxmint" |
"kalilinux") } -> true
| _ -> false
in
diff --git a/v2v/convert_linux.mli b/v2v/convert_linux.mli
index 22511b13c4..5823fe6502 100644
--- a/v2v/convert_linux.mli
+++ b/v2v/convert_linux.mli
@@ -19,7 +19,7 @@
(** Convert a Linux guest to run on KVM.
This module converts certain Enterprise Linux guests to run on
- KVM. RHEL, SuSE, Fedora, CentOS, OracleLinux, Debian, Ubuntu,
+ KVM. RHEL, SuSE, Fedora, CentOS, OracleLinux, ALT, Debian, Ubuntu,
Mint and Kali are supported by this module.
No functions are exported. When the module is linked to virt-v2v
--
2.28.0.rc2