From 4e83c988e223a64ab403f2533477f631758ccb7c Mon Sep 17 00:00:00 2001
From: zsdc <taras@vyos.io>
Date: Thu, 30 Dec 2021 19:15:50 +0200
Subject: images management: T4113: Improved GRUB config parsing
The commit fixes two problems with GRUB configuration items parser:
* items with only one `console=ttyS0` were wrongly detected as those that
have a `kvm` console type
* items where the `boot=live`option is the latest one cannot be removed
from a configuration during an image removal
---
scripts/vyatta-boot-image.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'scripts')
diff --git a/scripts/vyatta-boot-image.pl b/scripts/vyatta-boot-image.pl
index 0ecb442..140b8e9 100755
--- a/scripts/vyatta-boot-image.pl
+++ b/scripts/vyatta-boot-image.pl
@@ -102,7 +102,7 @@ sub parseGrubCfg {
# old install
$ehash{'ver'} = $OLD_IMG_VER_STR;
}
- if (/console=tty0.*console=ttyS[0-9]/) {
+ if (/console=ttyS\d(?!.*console)/) {
$ehash{'term'} = 'serial';
} else {
$ehash{'term'} = 'kvm';
@@ -170,7 +170,7 @@ sub deleteGrubEntries {
@entry = ();
} else {
if (/^\s+linux/) {
- if (/^\s+linux \/boot\/([^\/ ]+)\/.* boot=live /) {
+ if (/^\s+linux \/boot\/([^\/ ]+)\/.* boot=live/) {
# kernel line
$ver = $1;
} else {
--
cgit v1.2.3