From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 13 Jan 2020 21:42:49 +0000 (+0000)
Subject: Merge remote-tracking branch 'ms/next-dns-ng' into next
X-Git-Tag: v2.25-core141~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61cc563558f0bd2fed68a60e83f68d595855e7d7;p=ipfire-2.x.git

Merge remote-tracking branch 'ms/next-dns-ng' into next
---

61cc563558f0bd2fed68a60e83f68d595855e7d7
diff --cc config/rootfiles/common/aarch64/stage2
index 2d9a70f81d,167e7096ee..f4169a44e9
--- a/config/rootfiles/common/aarch64/stage2
+++ b/config/rootfiles/common/aarch64/stage2
@@@ -91,8 -91,8 +91,9 @@@ usr/lib6
  usr/local/bin/backupiso
  usr/local/bin/connscheduler
  usr/local/bin/consort.sh
+ usr/local/bin/convert-dns-settings
  usr/local/bin/convert-ovpn
 +usr/local/bin/filesystem-cleanup
  usr/local/bin/hddshutdown
  usr/local/bin/ipsec-interfaces
  usr/local/bin/makegraphs
diff --cc config/rootfiles/common/stage2
index b0680914ef,fcdfb41eb5..fca5404318
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@@ -90,8 -90,8 +90,9 @@@ usr/lib/libstdc++.so.
  usr/local/bin/backupiso
  usr/local/bin/connscheduler
  usr/local/bin/consort.sh
+ usr/local/bin/convert-dns-settings
  usr/local/bin/convert-ovpn
 +usr/local/bin/filesystem-cleanup
  usr/local/bin/hddshutdown
  usr/local/bin/ipsec-interfaces
  usr/local/bin/makegraphs
diff --cc config/rootfiles/common/x86_64/stage2
index 9d3334e69c,6cc918a92e..cc67837e53
--- a/config/rootfiles/common/x86_64/stage2
+++ b/config/rootfiles/common/x86_64/stage2
@@@ -92,8 -92,8 +92,9 @@@ usr/lib6
  usr/local/bin/backupiso
  usr/local/bin/connscheduler
  usr/local/bin/consort.sh
+ usr/local/bin/convert-dns-settings
  usr/local/bin/convert-ovpn
 +usr/local/bin/filesystem-cleanup
  usr/local/bin/hddshutdown
  usr/local/bin/ipsec-interfaces
  usr/local/bin/makegraphs