Skip to content

Commit

Permalink
sysutils/conmon: Fix podman's restart-policy handling
Browse files Browse the repository at this point in the history
Approved-by:    dch
Differential Revision: https://reviews.freebsd.org/D40437
  • Loading branch information
Doug Rabson authored and Doug Rabson committed Jun 12, 2023
1 parent 3a1f435 commit c85ba97
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 1 deletion.
2 changes: 1 addition & 1 deletion sysutils/conmon/Makefile
@@ -1,7 +1,7 @@
PORTNAME= conmon
DISTVERSIONPREFIX= v
DISTVERSION= 2.1.7
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils

MAINTAINER= dfr@FreeBSD.org
Expand Down
33 changes: 33 additions & 0 deletions sysutils/conmon/files/patch-src_close__fds.c
@@ -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 changes: 17 additions & 0 deletions sysutils/conmon/pkg-message
@@ -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
}
]

0 comments on commit c85ba97

Please sign in to comment.