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

v2v: linux: improve regex for resume= entries (RHBZ#1651987)

Browse Source 
Add few more characters for the devices of resume= entries in the
command line of grub: this way it is possible to match also /dev/mapper
devices.

This should require no further processing, since the names of the
/dev/mapper devices do not change after the conversion.

(cherry picked from commit 50b08fd84b)
This commit is contained in:
Pino Toscano
2018-12-04 18:43:59 +01:00
parent e4ba4ed8bb
commit e003f5b8e7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
v2v/convert_linux.ml
View File

@@ -983,7 +983,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 = PCRE.compile "^resume=(/dev/[a-z\\d]+)(.*)$"
let rex_resume = PCRE.compile "^resume=(/dev/[-a-z\\d/_]+)(.*)$"
and rex_device_cciss = PCRE.compile "^/dev/(cciss/c\\d+d\\d+)(?:p(\\d+))?$"
and rex_device = PCRE.compile "^/dev/([a-z]+)(\\d*)?$" in