mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-13 03:09:51 +03:00
bae515ff80
Updated patches. Some were no longer necessary, some needed refresh. Also added one patch from gentoo and one from void.
Adjust the build configuration:
the --with-confdir switch was pointing to the openrc conf.d, but what is expected is where automount will find the autofs.conf file
added --enable-force-shutdown switch (possibly temporary, needs more testing)
changed --sysconfigdir switch to the system sysconfdir, now that the --with-confdir is set as expected
stop removing the autofs(5) manpage
added etc/autofs/auto.master.d directory, which is referenced in the etc/autofs/auto.master file
Get logging working for automount: Because the initd script is using the supervise-daemon supervisor and starting automount with the -f (foreground) switch, all logging from automount is lost to stderr. Add supervise-daemon stderr logfile to remedy the situation.
51 lines
1.3 KiB
Diff
51 lines
1.3 KiB
Diff
From 10122e6da6f4c5482e0666707210a29fface2a64 Mon Sep 17 00:00:00 2001
|
|
From: John Vogel <jvogel4@stny.rr.com>
|
|
Date: Sat, 12 Oct 2024 12:31:08 -0400
|
|
Subject: [PATCH 2/2] add include for basename
|
|
|
|
---
|
|
daemon/automount.c | 2 +-
|
|
daemon/master.c | 1 +
|
|
modules/lookup_file.c | 1 +
|
|
3 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/daemon/automount.c b/daemon/automount.c
|
|
index 6cb3b1b..7a67d4b 100644
|
|
--- a/daemon/automount.c
|
|
+++ b/daemon/automount.c
|
|
@@ -33,7 +33,7 @@
|
|
#include <sys/time.h>
|
|
#include <sys/resource.h>
|
|
#include <sys/poll.h>
|
|
-#include <dirent.h>
|
|
+#include <libgen.h>
|
|
#include <sys/vfs.h>
|
|
#include <sys/utsname.h>
|
|
#ifdef WITH_SYSTEMD
|
|
diff --git a/daemon/master.c b/daemon/master.c
|
|
index f2c11e9..34102b5 100644
|
|
--- a/daemon/master.c
|
|
+++ b/daemon/master.c
|
|
@@ -25,6 +25,7 @@
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <ctype.h>
|
|
+#include <libgen.h>
|
|
#include "automount.h"
|
|
|
|
/* The root of the map entry tree */
|
|
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
|
|
index 99f2e21..0a39a7f 100644
|
|
--- a/modules/lookup_file.c
|
|
+++ b/modules/lookup_file.c
|
|
@@ -20,6 +20,7 @@
|
|
#include <time.h>
|
|
#include <ctype.h>
|
|
#include <signal.h>
|
|
+#include <libgen.h>
|
|
#include <sys/param.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
--
|
|
2.46.2
|
|
|