forked from Lainports/freebsd-ports
sysutils/conmon: Fix podman's restart-policy handling
Approved-by: dch Differential Revision: https://reviews.freebsd.org/D40437
This commit is contained in:
parent
3a1f435399
commit
c85ba9733b
3 changed files with 51 additions and 1 deletions
|
|
@ -1,7 +1,7 @@
|
|||
PORTNAME= conmon
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 2.1.7
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= sysutils
|
||||
|
||||
MAINTAINER= dfr@FreeBSD.org
|
||||
|
|
|
|||
33
sysutils/conmon/files/patch-src_close__fds.c
Normal file
33
sysutils/conmon/files/patch-src_close__fds.c
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
--- src/close_fds.c.orig 2023-02-28 02:39:11 UTC
|
||||
+++ src/close_fds.c
|
||||
@@ -22,6 +22,12 @@
|
||||
|
||||
#include <sys/stat.h>
|
||||
|
||||
+#ifdef __FreeBSD__
|
||||
+#define OPEN_FILES_DIR "/dev/fd"
|
||||
+#else
|
||||
+#define OPEN_FILES_DIR "/proc/self/fd"
|
||||
+#endif
|
||||
+
|
||||
static int open_files_max_fd;
|
||||
static fd_set *open_files_set;
|
||||
|
||||
@@ -31,7 +37,7 @@ static void __attribute__((constructor)) init()
|
||||
ssize_t size = 0;
|
||||
DIR *d;
|
||||
|
||||
- d = opendir("/proc/self/fd");
|
||||
+ d = opendir(OPEN_FILES_DIR);
|
||||
if (!d)
|
||||
return;
|
||||
|
||||
@@ -85,7 +91,7 @@ void close_all_fds_ge_than(int firstfd)
|
||||
struct dirent *ent;
|
||||
DIR *d;
|
||||
|
||||
- d = opendir("/proc/self/fd");
|
||||
+ d = opendir(OPEN_FILES_DIR);
|
||||
if (!d)
|
||||
return;
|
||||
|
||||
17
sysutils/conmon/pkg-message
Normal file
17
sysutils/conmon/pkg-message
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
[
|
||||
{ type: install
|
||||
message: <<EOM
|
||||
|
||||
To properly support podman's container restart policy, conmon needs fdescfs(5)
|
||||
to be mounted on /dev/fd.
|
||||
|
||||
If /dev/fd is not already mounted:
|
||||
|
||||
mount -t fdescfs fdesc /dev/fd
|
||||
|
||||
To make it permanent, add the following line to /etc/fstab:
|
||||
|
||||
fdesc /dev/fd fdescfs rw 0 0
|
||||
EOM
|
||||
}
|
||||
]
|
||||
Loading…
Add table
Reference in a new issue