From d139852058bff2f70b5de4bc64849cda21f2a532 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 24 Nov 2019 10:58:56 +0100 Subject: geneve: T1799: add Generic Network Virtualization Encapsulation --- sysconf/netdevice | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.3 From 16eb9bf96c778a88f3539d8ee0678a8de4e39a3e Mon Sep 17 00:00:00 2001 From: Robert Edström Date: Tue, 3 Dec 2019 10:53:49 +0900 Subject: Fix rootdev regex to support mmcblk devices --- scripts/install/install-get-partition | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From fb879438a11a867e80e4d506048f1091be796920 Mon Sep 17 00:00:00 2001 From: hagbard Date: Wed, 4 Dec 2019 15:37:57 -0800 Subject: syslog: T1845 bumping system version for migration script --- Makefile.am | 2 +- cfg-version/system@11 | 0 cfg-version/system@12 | 0 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 cfg-version/system@11 create mode 100644 cfg-version/system@12 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@11 deleted file mode 100644 index e69de29b..00000000 diff --git a/cfg-version/system@12 b/cfg-version/system@12 new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3 From bc9f1b572a8559924c271ec2fc6ef50b7645bc9d Mon Sep 17 00:00:00 2001 From: hagbard Date: Thu, 5 Dec 2019 08:04:48 -0800 Subject: Revert "syslog: T1845 bumping system version for migration script" This reverts commit fb879438a11a867e80e4d506048f1091be796920. --- Makefile.am | 2 +- cfg-version/system@11 | 0 cfg-version/system@12 | 0 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 cfg-version/system@11 delete mode 100644 cfg-version/system@12 diff --git a/Makefile.am b/Makefile.am index 0dcbe23a..86585b16 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@12 +curver_DATA += cfg-version/system@11 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@11 new file mode 100644 index 00000000..e69de29b diff --git a/cfg-version/system@12 b/cfg-version/system@12 deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3 From 4c1a439ee16acba176ae6a86cf3cb246b1c969e5 Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 6 Dec 2019 09:00:25 -0800 Subject: syslog: T1845: migration script support bumps system to 12 --- Makefile.am | 2 +- cfg-version/system@11 | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 cfg-version/system@11 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@11 deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3 From 55aa99348bdde42b2769737a32d271f707c2066b Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 6 Dec 2019 10:42:00 -0800 Subject: syslog: T1845: migration script support bumps system to 12 - forgot to add 'git add cfg-version/system@12' --- cfg-version/system@12 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 cfg-version/system@12 diff --git a/cfg-version/system@12 b/cfg-version/system@12 new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3