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 | |
| 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
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | cfg-version/system@12 (renamed from cfg-version/system@11) | 0 | ||||
| -rwxr-xr-x | scripts/install/install-get-partition | 2 | ||||
| -rw-r--r-- | sysconf/netdevice | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 86585b16..0dcbe23a 100644 --- 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 b/cfg-version/system@12 index e69de29b..e69de29b 100644 --- a/cfg-version/system@11 +++ b/cfg-version/system@12 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 diff --git a/sysconf/netdevice b/sysconf/netdevice index e9349789..0fded6ea 100644 --- a/sysconf/netdevice +++ b/sysconf/netdevice @@ -20,3 +20,4 @@ dum dummy l2tpeth l2tpv3 vxlan vxlan wg wireguard +gnv geneve |