Merge branch 'current' of github.com:vyos/vyatta-cfg-system into equu…

…leus * '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
vyos · Dec 6, 2019 · aaf2ce7 · aaf2ce7
2 parents 90b647b + 55aa993
commit aaf2ce7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -106,7 +106,7 @@ rsyslogdir = /etc/rsyslog.d
 #rsyslog_DATA = sysconf/vyatta-log.conf
 
 curver_DATA = cfg-version/vrrp@2
-curver_DATA += cfg-version/system@11
+curver_DATA += cfg-version/system@12
 curver_DATA += cfg-version/broadcast-relay@1
 curver_DATA += cfg-version/mdns@1
 curver_DATA += cfg-version/dhcp-server@5

diff --git a/cfg-version/system@11 → cfg-version/system@12 b/cfg-version/system@11 → cfg-version/system@12
diff --git 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

diff --git a/sysconf/netdevice b/sysconf/netdevice
@@ -20,3 +20,4 @@ dum     dummy
 l2tpeth l2tpv3
 vxlan   vxlan
 wg      wireguard
+gnv     geneve