Skip to content

Commit 798ba5c

Browse files
committed
merge #4428 into opencontainers/runc:main
Kir Kolyshkin (2): memfd-bind: more specific doc URL memfd-bind: fixup systemd unit file and README LGTMs: rata cyphar
2 parents 9112335 + 4fdd561 commit 798ba5c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

contrib/cmd/memfd-bind/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The provided `[email protected]` file can be used to get systemd to manage
2525
this daemon. You can supply the path like so:
2626

2727
```
28-
% systemctl start memfd-bind@/usr/bin/runc
28+
% systemctl start memfd-bind@$(systemd-escape -p /usr/bin/runc)
2929
```
3030

3131
Thus, there are three ways of protecting against CVE-2019-5736, in order of how
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[Unit]
2-
Description=Manage memfd-bind of %I
3-
Documentation=https://github.com/opencontainers/runc
2+
Description=Manage memfd-bind of %f
3+
Documentation=https://github.com/opencontainers/runc/blob/main/contrib/cmd/memfd-bind/README.md
44

55
[Service]
66
Type=simple
7-
ExecStart=memfd-bind "%I"
8-
ExecStop=memfd-bind --cleanup "%I"
7+
ExecStart=memfd-bind "%f"
8+
ExecStop=memfd-bind --cleanup "%f"
99

1010
[Install]
1111
WantedBy=multi-user.target

0 commit comments

Comments
 (0)