summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-12-31 09:02:42 +0100
committerGitHub <noreply@github.com>2021-12-31 09:02:42 +0100
commit07672e05a6f02bf93d6ea59cd21b689174926e79 (patch)
tree3ee996464abf217036df230d03176a7cd64f62e9 /scripts
parent3b99caf65d3392c88600066a93fc0b29b767c84c (diff)
parentcbc5a8ef2795326b561d599b76ee2052cbb31419 (diff)
downloadvyatta-op-07672e05a6f02bf93d6ea59cd21b689174926e79.tar.gz
vyatta-op-07672e05a6f02bf93d6ea59cd21b689174926e79.zip
Merge pull request #52 from zdc/T4113-sagitta
images management: T4113: Improved GRUB config parsing
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/vyatta-boot-image.pl4
1 files changed, 2 insertions, 2 deletions
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 {