From 195523bf102bfa4629a51874eae93716cd5b09ae Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Fri, 23 Apr 2021 09:05:33 +0200
Subject: [PATCH] misc_systemd_units: Remove obsolete `StandardOutput=syslog`

On Ubuntu 20.10 with systemd 246, systemd warnings like below.

    Apr 23 08:57:24 flughafenberlinbrandenburgwillybrandt systemd[1]: /etc/systemd/system/mxvlan.service:10: Standard output type syslog is obsolete, automatically updating to journal. Please update your unit file, and consider removing the setting altogether.

So remove these obsolete entries, which are also obsolete in systemd 242
used in MarIuX.

systemd 246 introduced the warning:

>        * StandardError= and StandardOutput= in unit files no longer support
>          the "syslog" and "syslog-console" switches. They were long removed
>          from the documentation, but will now result in warnings when used,
>          and be converted to "journal" and "journal+console" automatically.
---
 misc_systemd_units/dhcrelay.service | 1 -
 misc_systemd_units/gdm.service      | 1 -
 misc_systemd_units/getcams.service  | 1 -
 misc_systemd_units/mxvlan.service   | 1 -
 misc_systemd_units/network.service  | 1 -
 5 files changed, 5 deletions(-)

diff --git a/misc_systemd_units/dhcrelay.service b/misc_systemd_units/dhcrelay.service
index 1903eef2..cb0b0977 100644
--- a/misc_systemd_units/dhcrelay.service
+++ b/misc_systemd_units/dhcrelay.service
@@ -10,7 +10,6 @@ ConditionHost=bka.molgen.mpg.de
 
 ExecStart=/usr/sbin/dhcrelay -4 -d dhcp.molgen.mpg.de
 Restart=always
-StandardOutput=syslog
 
 [Install]
 
diff --git a/misc_systemd_units/gdm.service b/misc_systemd_units/gdm.service
index e454a458..438de268 100644
--- a/misc_systemd_units/gdm.service
+++ b/misc_systemd_units/gdm.service
@@ -6,7 +6,6 @@ ConditionPathExists=!/node/tags/lightdm
 
 [Service]
 ExecStart=/usr/sbin/gdm
-StandardOutput=syslog
 Restart=always
 
 [Install]
diff --git a/misc_systemd_units/getcams.service b/misc_systemd_units/getcams.service
index 6aa836e3..b944f0d6 100644
--- a/misc_systemd_units/getcams.service
+++ b/misc_systemd_units/getcams.service
@@ -5,6 +5,5 @@ Description=mxstartup baucamhttpd
 User=zmuser
 WorkingDirectory=/project/baucam
 ExecStart=/project/baucam/getcam.pl
-StandardOutput=syslog
 Restart=always
 RestartSec=10s
diff --git a/misc_systemd_units/mxvlan.service b/misc_systemd_units/mxvlan.service
index 684c78e2..b7ecea4f 100644
--- a/misc_systemd_units/mxvlan.service
+++ b/misc_systemd_units/mxvlan.service
@@ -7,7 +7,6 @@ Before=network.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-StandardOutput=syslog
 ExecStart=/usr/sbin/mxvlanctl start
 ExecStop=/usr/sbin/mxvlanctl stop
 
diff --git a/misc_systemd_units/network.service b/misc_systemd_units/network.service
index 931a46e9..09e2cf7f 100644
--- a/misc_systemd_units/network.service
+++ b/misc_systemd_units/network.service
@@ -11,7 +11,6 @@ ExecStart=/sbin/ip addr add ${MX_IPADDR}/20 broadcast 141.14.31.255 dev ${MX_NET
 ExecStart=/sbin/ip link set up dev ${MX_NETDEV}
 ExecStart=/sbin/ip route add default via 141.14.16.128
 ExecStop=/sbin/ip addr del ${MX_IPADDR}/20 dev ${MX_NETDEV}
-StandardOutput=syslog
 
 [Install]
 WantedBy=network.target