diff options
| author | Daniil Baturin <daniil@baturin.org> | 2016-10-22 04:05:55 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-22 04:05:55 +0700 |
| commit | 8cb6fcc0bafd2c846f8da6a6f2b99146c4259257 (patch) | |
| tree | 7bd99e81f0401be519c903d06ae5a770235af0c9 | |
| parent | a34e4f13c9b387c184b4f55d53477b0b33610bd7 (diff) | |
| parent | 55915987f745d48fa4b1319888c1edb86963c6ba (diff) | |
| download | vyatta-op-8cb6fcc0bafd2c846f8da6a6f2b99146c4259257.tar.gz vyatta-op-8cb6fcc0bafd2c846f8da6a6f2b99146c4259257.zip | |
Merge pull request #6 from gsadams/current
Correctly identify ttyS1 as a serial console, as well (issue T146).
| -rwxr-xr-x | scripts/vyatta-boot-image.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/vyatta-boot-image.pl b/scripts/vyatta-boot-image.pl index 52b4769..d3ca5e8 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=ttyS0/) { + if (/console=tty0.*console=ttyS[0-9]/) { $ehash{'term'} = 'serial'; } else { $ehash{'term'} = 'kvm'; |