our packages converge).
+openvswitch (2.15.0~git20210104.def6eb1ea+dfsg1-3) unstable; urgency=medium
+
+ * Reworked .service files to make them look like in Ubuntu (as I still want
+ our packages converge).
+
+ -- Thomas Goirand <zigo@debian.org> Mon, 11 Jan 2021 21:08:37 +0100
+
openvswitch (2.15.0~git20210104.def6eb1ea+dfsg1-2) unstable; urgency=medium
* Blacklist more tests for mipsel and mipsel64.
+++ /dev/null
-[Unit]
-Description=Open vSwitch Internal Unit
-PartOf=openvswitch-switch.service
-DefaultDependencies=no
-After=apparmor.service local-fs.target systemd-tmpfiles-setup.service dpdk.service
-Wants=network-pre.target openvswitch-switch.service
-Before=network-pre.target openvswitch-switch.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=-/etc/default/openvswitch-switch
-ExecStart=/usr/share/openvswitch/scripts/ovs-ctl start \
- --system-id=random $OVS_CTL_OPTS
-ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop
--- /dev/null
+[Unit]
+Description=Open vSwitch Forwarding Unit
+After=ovsdb-server.service network-pre.target systemd-udev-settle.service
+Before=network.target networking.service
+Requires=ovsdb-server.service
+ReloadPropagatedFrom=ovsdb-server.service
+AssertPathIsReadWrite=/var/run/openvswitch/db.sock
+PartOf=openvswitch-switch.service
+DefaultDependencies=no
+
+[Service]
+LimitNOFILE=1048576
+Type=forking
+Restart=on-failure
+Environment=HOME=/var/run/openvswitch
+EnvironmentFile=-/etc/default/openvswitch-switch
+ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
+ --no-ovsdb-server --no-monitor --system-id=random \
+ start $OVS_CTL_OPTS
+ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server stop
+ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \
+ --no-monitor --system-id=random \
+ restart $OVS_CTL_OPTS
+TimeoutSec=300
--- /dev/null
+[Unit]
+Description=Open vSwitch Database Unit
+After=syslog.target network-pre.target dpdk.service local-fs.target
+Before=network.target networking.service
+PartOf=openvswitch-switch.service
+DefaultDependencies=no
+
+[Service]
+LimitNOFILE=1048576
+Type=forking
+Restart=on-failure
+EnvironmentFile=-/etc/default/openvswitch-switch
+ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
+ --no-ovs-vswitchd --no-monitor --system-id=random \
+ start $OVS_CTL_OPTS
+ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop
+ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \
+ --no-monitor restart $OVS_CTL_OPTS
+RuntimeDirectory=openvswitch
+RuntimeDirectoryMode=0755
+RuntimeDirectoryPreserve=yes
[Unit]
Description=Open vSwitch
-After=openvswitch-nonetwork.service
-Requires=openvswitch-nonetwork.service
-Before=networking.service
+Before=network.target
+After=network-pre.target ovsdb-server.service ovs-vswitchd.service
+PartOf=network.target
+Requires=ovsdb-server.service
+Requires=ovs-vswitchd.service
[Service]
Type=oneshot
-ExecStart=/etc/init.d/openvswitch-switch systemd-start
-ExecStop=/etc/init.d/openvswitch-switch systemd-stop
+ExecStart=/bin/true
+ExecReload=/usr/share/openvswitch/scripts/ovs-systemd-reload
+ExecStop=/bin/true
RemainAfterExit=yes
[Install]