1 |
commit: ad49e79cd1c439fb595b872db60b97eff18e1a62 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Jun 29 18:13:46 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 29 19:19:44 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad49e79c |
7 |
|
8 |
net-misc/openvswitch: remove unused files |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/12354 |
11 |
|
12 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
13 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
14 |
|
15 |
net-misc/openvswitch/files/ovs-vswitchd-r2.service | 26 ---------------------- |
16 |
net-misc/openvswitch/files/ovs-vswitchd_conf | 6 ----- |
17 |
net-misc/openvswitch/files/ovsdb-server-r2.service | 24 -------------------- |
18 |
3 files changed, 56 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r2.service b/net-misc/openvswitch/files/ovs-vswitchd-r2.service |
21 |
deleted file mode 100644 |
22 |
index 3092fdaaa66..00000000000 |
23 |
--- a/net-misc/openvswitch/files/ovs-vswitchd-r2.service |
24 |
+++ /dev/null |
25 |
@@ -1,26 +0,0 @@ |
26 |
-[Unit] |
27 |
-Description=Open vSwitch Daemon |
28 |
-Documentation=man:ovs-vswitchd |
29 |
-Wants=network.target |
30 |
-Before=network.target network.service |
31 |
-Requires=ovsdb-server.service |
32 |
-After=ovsdb-server.service network-pre.target systemd-udev-settle.service |
33 |
-ReloadPropagatedFrom=ovsdb-server.service |
34 |
-AssertPathIsReadWrite=/var/run/openvswitch/db.sock |
35 |
- |
36 |
-[Service] |
37 |
-Type=forking |
38 |
-Restart=on-failure |
39 |
-Environment=HOME=/var/run/openvswitch |
40 |
-EnvironmentFile=-/run/openvswitch/useropts |
41 |
-EnvironmentFile=-/etc/conf.d/ovs-vswitchd |
42 |
-ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ |
43 |
- --no-ovsdb-server --no-monitor --system-id=random \ |
44 |
- ${OVSUSER} start $OPTIONS |
45 |
-ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server stop |
46 |
-ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \ |
47 |
- --no-monitor --system-id=random ${OVSUSER} restart $OPTIONS |
48 |
-TimeoutSec=300 |
49 |
- |
50 |
-[Install] |
51 |
-WantedBy=multi-user.target |
52 |
|
53 |
diff --git a/net-misc/openvswitch/files/ovs-vswitchd_conf b/net-misc/openvswitch/files/ovs-vswitchd_conf |
54 |
deleted file mode 100644 |
55 |
index c9eadb41862..00000000000 |
56 |
--- a/net-misc/openvswitch/files/ovs-vswitchd_conf |
57 |
+++ /dev/null |
58 |
@@ -1,6 +0,0 @@ |
59 |
- |
60 |
-# Connection string for the configuration database (usually a unix socket) |
61 |
-DATABASE="unix:/var/run/openvswitch/db.sock" |
62 |
- |
63 |
-# Additional options |
64 |
-OPTIONS="--mlockall" |
65 |
|
66 |
diff --git a/net-misc/openvswitch/files/ovsdb-server-r2.service b/net-misc/openvswitch/files/ovsdb-server-r2.service |
67 |
deleted file mode 100644 |
68 |
index 5ff6f904466..00000000000 |
69 |
--- a/net-misc/openvswitch/files/ovsdb-server-r2.service |
70 |
+++ /dev/null |
71 |
@@ -1,24 +0,0 @@ |
72 |
-[Unit] |
73 |
-Description=Open vSwitch Database Unit |
74 |
-Documentation=man:ovsdb-server |
75 |
-After=syslog.target network-pre.target |
76 |
-Before=network.target network.service |
77 |
-Wants=ovs-delete-transient-ports.service |
78 |
- |
79 |
-[Service] |
80 |
-Type=forking |
81 |
-Restart=on-failure |
82 |
-EnvironmentFile=-/etc/conf.d/ovsdb-server |
83 |
-ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch |
84 |
-ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch/useropts; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVSUSER=--ovs-user=${OVS_USER_ID}" > /run/openvswitch/useropts; fi' |
85 |
-EnvironmentFile=-/run/openvswitch/useropts |
86 |
-ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ |
87 |
- --no-ovs-vswitchd --no-monitor --system-id=random \ |
88 |
- ${OVSUSER} \ |
89 |
- start $OPTIONS |
90 |
-ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop |
91 |
-ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \ |
92 |
- ${OVSUSER} \ |
93 |
- --no-monitor restart $OPTIONS |
94 |
-RuntimeDirectory=openvswitch |
95 |
-RuntimeDirectoryMode=0755 |