From 4ddc0add85fd2d08fcc45606c73ff6efb833ef4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= Date: Sat, 6 Aug 2016 20:04:53 +0200 Subject: [PATCH] v2v: fix regex replacement in grub2_update_console MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The replacement string was wrong. There are only two match groups in the regular expression, not three. Signed-off-by: Tomáš Golembiovský --- v2v/convert_linux.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 06943cdd5..4b1ce995b 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -1057,9 +1057,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = if Str.string_match rex grub_cmdline 0 then ( let new_grub_cmdline = if not remove then - Str.global_replace rex "\\1console=ttyS0\\3" grub_cmdline + Str.global_replace rex "\\1console=ttyS0\\2" grub_cmdline else - Str.global_replace rex "\\1\\3" grub_cmdline in + Str.global_replace rex "\\1\\2" grub_cmdline in g#aug_set path new_grub_cmdline; g#aug_save ();