From 56de53ee30063df8637364a31b43471707aca5b9 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Tue, 13 Dec 2016 19:22:26 +0200
Subject: [PATCH] systemd: only override issues with stock units

Only oidentd.socket and miredo.service were copied instead of being
units that exist in the system and they don't need to do anything
else than fix the issue I have with the stock units.

* oidentd.socket is IPv6-only on my systems unless is BindIPv6Only=both.
  because of net.ipv6.bindv6only=1
* miredo.service is here because it starts before there is network
  connection (network-online.target) and there is never network
  connection with laptops before they are connected to WLAN even if
  NetworkManager might be up seeking/connecting to network.
---
 etc/systemd/system/README.md                      |  2 +-
 etc/systemd/system/ipv6/miredo.service            | 10 ----------
 etc/systemd/system/miredo.service.d/override.conf |  3 +++
 etc/systemd/system/oidentd.socket                 | 10 ----------
 etc/systemd/system/oidentd.socket.d/override.conf |  2 ++
 5 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 etc/systemd/system/ipv6/miredo.service
 create mode 100644 etc/systemd/system/miredo.service.d/override.conf
 delete mode 100644 etc/systemd/system/oidentd.socket
 create mode 100644 etc/systemd/system/oidentd.socket.d/override.conf

diff --git a/etc/systemd/system/README.md b/etc/systemd/system/README.md
index ead36349..a3a937bf 100644
--- a/etc/systemd/system/README.md
+++ b/etc/systemd/system/README.md
@@ -1,6 +1,6 @@
 Systemd services. These are sorted by some kind of category into
 subdirectories. The sudirectories won't exist in the real
-`/etc/systemd/system` unless they end `.wants` or something similar
+`/etc/systemd/system` unless they end `.wants` or `.d` or something similar
 and I forget to update this README file if that happens.
 
 * reflector.service is copied from https://wiki.archlinux.org/index.php/Reflector
diff --git a/etc/systemd/system/ipv6/miredo.service b/etc/systemd/system/ipv6/miredo.service
deleted file mode 100644
index 37928d3c..00000000
--- a/etc/systemd/system/ipv6/miredo.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Teredo IPv6 Tunneling Daemon
-After=network-online.target unbound.service
-
-[Service]
-ExecStart=/usr/bin/miredo -f
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/etc/systemd/system/miredo.service.d/override.conf b/etc/systemd/system/miredo.service.d/override.conf
new file mode 100644
index 00000000..0bb22306
--- /dev/null
+++ b/etc/systemd/system/miredo.service.d/override.conf
@@ -0,0 +1,3 @@
+[Unit]
+# If unbound is used for DNS, also add unbound.service
+After=network-online.target
diff --git a/etc/systemd/system/oidentd.socket b/etc/systemd/system/oidentd.socket
deleted file mode 100644
index ffe376b6..00000000
--- a/etc/systemd/system/oidentd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Ident (RFC 1413) socket
-
-[Socket]
-ListenStream=113
-BindIPv6Only=both
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/etc/systemd/system/oidentd.socket.d/override.conf b/etc/systemd/system/oidentd.socket.d/override.conf
new file mode 100644
index 00000000..3c69f4b4
--- /dev/null
+++ b/etc/systemd/system/oidentd.socket.d/override.conf
@@ -0,0 +1,2 @@
+[Socket]
+BindIPv6Only=both