diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-06 21:09:00 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-06 21:09:00 +0100 |
| commit | aaf2ce7f84986854d0d660d224ec14eb35c23293 (patch) | |
| tree | 5b67efe355030d1064bce395076fb0cd0e4f4672 /scripts/install | |
| parent | 90b647b1ce91c2ac92a57c0781f6da0a4c21f21d (diff) | |
| parent | 55aa99348bdde42b2769737a32d271f707c2066b (diff) | |
| download | vyatta-cfg-system-aaf2ce7f84986854d0d660d224ec14eb35c23293.tar.gz vyatta-cfg-system-aaf2ce7f84986854d0d660d224ec14eb35c23293.zip | |
Merge branch 'current' of github.com:vyos/vyatta-cfg-system into equuleus
* 'current' of github.com:vyos/vyatta-cfg-system:
syslog: T1845: migration script support bumps system to 12
syslog: T1845: migration script support bumps system to 12
Revert "syslog: T1845 bumping system version for migration script"
syslog: T1845 bumping system version for migration script
Fix rootdev regex to support mmcblk devices
geneve: T1799: add Generic Network Virtualization Encapsulation
Diffstat (limited to 'scripts/install')
| -rwxr-xr-x | scripts/install/install-get-partition | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition index 560125c2..5d4f5541 100755 --- a/scripts/install/install-get-partition +++ b/scripts/install/install-get-partition @@ -363,7 +363,7 @@ select_partition () { if [ ${part:0:2} = "md" ]; then parttype="RAID" else - rootdev=$(echo $part | sed 's/[0-9]//g') + rootdev=$(echo $part | sed -E 's/p?[0-9]$//g') parttype=$(fdisk -l /dev/$rootdev | grep $part | grep Linux) fi if [ -n "$parttype" ]; then |