summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-12-07 20:00:14 +0100
committerChristian Poessinger <christian@poessinger.com>2018-12-07 20:00:14 +0100
commitc1008389a525994feebfb059d1e7bedb785e2804 (patch)
treec26aff5de39b255edda0efebc5eee825f0837d25
parent55786382275a5ebac17cb8f390dae090bbc4c2eb (diff)
downloadvyatta-cfg-system-c1008389a525994feebfb059d1e7bedb785e2804.tar.gz
vyatta-cfg-system-c1008389a525994feebfb059d1e7bedb785e2804.zip
T1060: build fix for wrong config-version number
Commit 9d35610c173 ("T1060: add missing version file for webproxy") assumed that there is a webproxy config version of 0 but we already have 1. This lead to duplicate files detected by apt.
-rw-r--r--Makefile.am2
-rw-r--r--cfg-version/webproxy@2 (renamed from cfg-version/webproxy@1)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 6759bdc4..ce970826 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -125,7 +125,7 @@ curver_DATA += cfg-version/ssh@1
curver_DATA += cfg-version/l2tp@1
curver_DATA += cfg-version/pptp@1
curver_DATA += cfg-version/ntp@1
-curver_DATA += cfg-version/webproxy@1
+curver_DATA += cfg-version/webproxy@2
cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
cpio -0pd
diff --git a/cfg-version/webproxy@1 b/cfg-version/webproxy@2
index e69de29b..e69de29b 100644
--- a/cfg-version/webproxy@1
+++ b/cfg-version/webproxy@2