From 4526ceadf4a9a81b51ec394970188daccd69539b Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 4 Aug 2020 08:34:52 +0200
Subject: cleanup: convert multiple files from DOS to UNIX line ending

---
 data/templates/frr/bgp.frr.tmpl                    |  2 +-
 data/templates/system/curlrc.tmpl                  | 16 +++++-----
 .../include/bgp-afi-aggregate-address.xml.i        | 24 +++++++--------
 .../systemd/system/radvd.service.d/override.conf   | 34 +++++++++++-----------
 src/systemd/wpa_supplicant-macsec@.service         | 34 +++++++++++-----------
 5 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index cd6f31c93..cdf4cb4fe 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -1 +1 @@
-!
+!
diff --git a/data/templates/system/curlrc.tmpl b/data/templates/system/curlrc.tmpl
index 675e35a0c..3e5ce801c 100644
--- a/data/templates/system/curlrc.tmpl
+++ b/data/templates/system/curlrc.tmpl
@@ -1,8 +1,8 @@
-{% if http_client is defined %}
-{%   if http_client.source_interface is defined %}
---interface "{{ http_client.source_interface }}"
-{%   endif %}
-{%   if http_client.source_address is defined %}
---interface "{{ http_client.source_address }}"
-{%   endif %}
-{% endif %}
+{% if http_client is defined %}
+{%   if http_client.source_interface is defined %}
+--interface "{{ http_client.source_interface }}"
+{%   endif %}
+{%   if http_client.source_address is defined %}
+--interface "{{ http_client.source_address }}"
+{%   endif %}
+{% endif %}
diff --git a/interface-definitions/include/bgp-afi-aggregate-address.xml.i b/interface-definitions/include/bgp-afi-aggregate-address.xml.i
index 40c030fc1..050ee0074 100644
--- a/interface-definitions/include/bgp-afi-aggregate-address.xml.i
+++ b/interface-definitions/include/bgp-afi-aggregate-address.xml.i
@@ -1,12 +1,12 @@
-<leafNode name="as-set">
-  <properties>
-    <help>Generate AS-set path information for this aggregate address</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<leafNode name="summary-only">
-  <properties>
-    <help>Announce the aggregate summary network only</help>
-    <valueless/>
-  </properties>
-</leafNode>
+<leafNode name="as-set">
+  <properties>
+    <help>Generate AS-set path information for this aggregate address</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="summary-only">
+  <properties>
+    <help>Announce the aggregate summary network only</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/src/etc/systemd/system/radvd.service.d/override.conf b/src/etc/systemd/system/radvd.service.d/override.conf
index 44c4345e1..c2f640cf5 100644
--- a/src/etc/systemd/system/radvd.service.d/override.conf
+++ b/src/etc/systemd/system/radvd.service.d/override.conf
@@ -1,17 +1,17 @@
-[Unit]
-ConditionPathExists=/run/radvd/radvd.conf
-After=
-After=vyos-router.service
-
-[Service]
-WorkingDirectory=
-WorkingDirectory=/run/radvd
-ExecStartPre=
-ExecStartPre=/usr/sbin/radvd --logmethod stderr_clean --configtest --config /run/radvd/radvd.conf
-ExecStart=
-ExecStart=/usr/sbin/radvd --logmethod stderr_clean --config /run/radvd/radvd.conf --pidfile /run/radvd/radvd.pid
-ExecReload=
-ExecReload=/usr/sbin/radvd --logmethod stderr_clean --configtest --config /run/radvd/radvd.conf
-ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=
-PIDFile=/run/radvd/radvd.pid
+[Unit]
+ConditionPathExists=/run/radvd/radvd.conf
+After=
+After=vyos-router.service
+
+[Service]
+WorkingDirectory=
+WorkingDirectory=/run/radvd
+ExecStartPre=
+ExecStartPre=/usr/sbin/radvd --logmethod stderr_clean --configtest --config /run/radvd/radvd.conf
+ExecStart=
+ExecStart=/usr/sbin/radvd --logmethod stderr_clean --config /run/radvd/radvd.conf --pidfile /run/radvd/radvd.pid
+ExecReload=
+ExecReload=/usr/sbin/radvd --logmethod stderr_clean --configtest --config /run/radvd/radvd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=
+PIDFile=/run/radvd/radvd.pid
diff --git a/src/systemd/wpa_supplicant-macsec@.service b/src/systemd/wpa_supplicant-macsec@.service
index 21e189e4b..7e0bee8e1 100644
--- a/src/systemd/wpa_supplicant-macsec@.service
+++ b/src/systemd/wpa_supplicant-macsec@.service
@@ -1,17 +1,17 @@
-[Unit]
-Description=WPA supplicant daemon (macsec-specific version)
-Requires=sys-subsystem-net-devices-%i.device
-ConditionPathExists=/run/wpa_supplicant/%I.conf
-After=vyos-router.service
-RequiresMountsFor=/run
-
-# NetworkManager users will probably want the dbus version instead.
-
-[Service]
-Type=simple
-WorkingDirectory=/run/wpa_supplicant
-PIDFile=/run/wpa_supplicant/%I.pid
-ExecStart=/sbin/wpa_supplicant -c/run/wpa_supplicant/%I.conf -Dmacsec_linux -i%I
-
-[Install]
-WantedBy=multi-user.target
+[Unit]
+Description=WPA supplicant daemon (macsec-specific version)
+Requires=sys-subsystem-net-devices-%i.device
+ConditionPathExists=/run/wpa_supplicant/%I.conf
+After=vyos-router.service
+RequiresMountsFor=/run
+
+# NetworkManager users will probably want the dbus version instead.
+
+[Service]
+Type=simple
+WorkingDirectory=/run/wpa_supplicant
+PIDFile=/run/wpa_supplicant/%I.pid
+ExecStart=/sbin/wpa_supplicant -c/run/wpa_supplicant/%I.conf -Dmacsec_linux -i%I
+
+[Install]
+WantedBy=multi-user.target
-- 
cgit v1.2.3