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

v2v: linux: Fix rewriting of grub2 GRUB_CMDLINE=...resume=<device>...

Browse Source 
Commit dbe0b69f24 transscribed the Perl
regexp incorrectly so that it only matched the impossible case of
‘resume=/dev/X’ for a single non-whitespace character X.

This fixes the regular expression, referencing back to the original
Perl code in virt-v2v.
This commit is contained in:
Richard W.M. Jones
2017-09-21 12:21:28 +01:00
parent 95b0da8f37
commit 3a4410000e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
v2v/convert_linux.ml
View File

@@ -975,7 +975,7 @@ let convert (g : G.guestfs) inspect source output rcaps =
List.flatten (List.map Array.to_list (List.map g#aug_match paths)) in
(* Map device names for each entry. *)
let rex_resume = Str.regexp "^\\(.*resume=\\)\\(/dev/[^ ]\\)\\(.*\\)$"
let rex_resume = PCRE.compile "^(.*resume=)(/dev/\\S+)(.*)$"
and rex_device_cciss_p =
Str.regexp "^/dev/\\(cciss/c[0-9]+d[0-9]+\\)p\\([0-9]+\\)$"
and rex_device_cciss =
@@ -1001,10 +1001,10 @@ let convert (g : G.guestfs) inspect source output rcaps =
if String.find path "GRUB_CMDLINE" >= 0 then (
(* Handle grub2 resume=<dev> specially. *)
if Str.string_match rex_resume value 0 then (
let start = Str.matched_group 1 value
and device = Str.matched_group 2 value
and end_ = Str.matched_group 3 value in
if PCRE.matches rex_resume value then (
let start = PCRE.sub 1
and device = PCRE.sub 2
and end_ = PCRE.sub 3 in
let device = replace_if_device path device in
start ^ device ^ end_
)