Hi Ian,
Please apply attached trivial patch. It is run-tested.
--
vda
diff -d -urpN autofs-5.0.0_beta1/daemon/automount.c autofs-5.0.0_beta1-fg/daemon/automount.c
--- autofs-5.0.0_beta1/daemon/automount.c 2006-05-02 08:37:35.000000000 +0100
+++ autofs-5.0.0_beta1-fg/daemon/automount.c 2007-09-26 10:27:30.000000000 +0100
@@ -413,6 +413,7 @@ int count_mounts(struct autofs_point *ap
return counter.count;
}
+/* UNUSED
static void check_rm_dirs(struct autofs_point *ap, const char *path, int incl)
{
if ((!ap->ghost) ||
@@ -423,6 +424,7 @@ static void check_rm_dirs(struct autofs_
else if (ap->ghost && (ap->type == LKP_INDIRECT))
rm_unwanted(path, 0, ap->dev);
}
+*/
/* umount all filesystems mounted under path. If incl is true, then
it also tries to umount path itself */
@@ -717,6 +719,7 @@ static int handle_packet(struct autofs_p
return -1;
}
+
static void become_daemon(unsigned foreground)
{
FILE *pidfp;
@@ -1278,7 +1281,7 @@ static void usage(void)
" -t --timeout n auto-unmount in n seconds (0-disable)\n"
" -v --verbose be verbose\n"
" -d --debug log debuging info\n"
- /*" -f --foreground do not fork into background\n" */
+ " -f --foreground do not fork into background\n"
" -V --version print version and exit\n"
, program);
}
diff -d -urpN autofs-5.0.0_beta1/daemon/direct.c autofs-5.0.0_beta1-fg/daemon/direct.c
--- autofs-5.0.0_beta1/daemon/direct.c 2006-05-02 08:37:35.000000000 +0100
+++ autofs-5.0.0_beta1-fg/daemon/direct.c 2007-09-26 10:24:17.000000000 +0100
@@ -213,7 +213,8 @@ int umount_autofs_direct(struct autofs_p
static int unlink_mount_tree(struct list_head *list, const char *mount)
{
struct list_head *p;
- int rv, ret, need_umount;
+ int rv, ret;
+/* int need_umount; */
pid_t pgrp = getpgrp();
char spgrp[10];
/*
_______________________________________________
autofs mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/autofs
