5.0.0_beta1: uncomment "-f --foreground..." help text; comment out unused stuff.

diff -d -urpN autofs-5.0.0_beta1/daemon/automount.c autofs-5.0.0_beta1-fg/daemon/automount.c
@@ -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
@@ -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];
 /*

diff -d -urpN autofs-5.0.0_beta1-fg/daemon/automount.c autofs-5.0.0_beta1-stderr/daemon/automount.c
@@ -719,12 +719,12 @@ static int handle_packet(struct autofs_p
 	return -1;
 }
 
+static unsigned char to_stderr;
 
 static void become_daemon(unsigned foreground)
 {
 	FILE *pidfp;
 	char buf[MAX_ERR_BUF];
-	unsigned to_stderr = 0;
 	pid_t pid;
 
 	/* Don't BUSY any directories unnecessarily */

@@ -1282,6 +1282,7 @@ static void usage(void)
 		"	-v --verbose	be verbose\n"
 		"	-d --debug	log debuging info\n"
 		"	-f --foreground do not fork into background\n"
+		"	-s --stderr	log to stderr instead of syslog\n"
 		"	-V --version	print version and exit\n"
 		, program);
 }

@@ -1302,6 +1303,7 @@ int main(int argc, char *argv[])
 		{"verbose", 0, 0, 'v'},
 		{"debug", 0, 0, 'd'},
 		{"foreground", 0, 0, 'f'},
+		{"stderr", 0, 0, 's'},
 		{"version", 0, 0, 'V'},
 		{0, 0, 0, 0}
 	};

@@ -1318,7 +1320,7 @@ int main(int argc, char *argv[])
 	foreground = 0;
 
 	opterr = 0;
-	while ((opt = getopt_long(argc, argv, "+hp:t:vdfV", long_options, NULL)) != EOF) {
+	while ((opt = getopt_long(argc, argv, "+hp:t:vdfsV", long_options, NULL)) != EOF) {
 		switch (opt) {
 		case 'h':
 			usage();

@@ -1344,6 +1346,10 @@ int main(int argc, char *argv[])
 			foreground = 1;
 			break;
 
+		case 's':
+			to_stderr = 1;
+			break;
+
 		case 'V':
 			printf("Linux automount version %s\n", version);
 			exit(0);