|
 |
5674919 |
autofs-5.1.6 - remove intr hosts map mount option
|
|
|
5674919 |
|
|
|
5674919 |
From: Ian Kent <raven@themaw.net>
|
|
|
5674919 |
|
|
|
5674919 |
Don't use the intr option on NFS mounts by default, it's been ignored
|
|
|
5674919 |
by the kernel for a long time now.
|
|
|
5674919 |
|
|
|
5674919 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
5674919 |
---
|
|
|
5674919 |
CHANGELOG | 1 +
|
|
|
5674919 |
man/auto.master.5.in | 4 ++--
|
|
|
5674919 |
man/autofs.5 | 4 ++--
|
|
|
5674919 |
modules/parse_sun.c | 9 +++------
|
|
|
5674919 |
samples/auto.misc | 2 +-
|
|
|
5674919 |
samples/auto.net | 2 +-
|
|
|
5674919 |
6 files changed, 10 insertions(+), 12 deletions(-)
|
|
|
5674919 |
|
|
|
5674919 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
5674919 |
index 106b811c..fa5992aa 100644
|
|
|
5674919 |
--- a/CHANGELOG
|
|
|
5674919 |
+++ b/CHANGELOG
|
|
|
5674919 |
@@ -6,6 +6,7 @@ xx/xx/2020 autofs-5.1.7
|
|
|
5674919 |
- fix a regression with map instance lookup.
|
|
|
5674919 |
- correct fsf address.
|
|
|
5674919 |
- samples: fix Makefile targets' directory dependencies
|
|
|
5674919 |
+- remove intr hosts map mount option.
|
|
|
5674919 |
|
|
|
5674919 |
07/10/2019 autofs-5.1.6
|
|
|
5674919 |
- support strictexpire mount option.
|
|
|
5674919 |
diff --git a/man/auto.master.5.in b/man/auto.master.5.in
|
|
|
5674919 |
index 2a0b672a..72fbfd23 100644
|
|
|
5674919 |
--- a/man/auto.master.5.in
|
|
|
5674919 |
+++ b/man/auto.master.5.in
|
|
|
5674919 |
@@ -262,8 +262,8 @@ For example, with an entry in the master map of
|
|
|
5674919 |
accessing /net/myserver will mount exports from myserver on directories below
|
|
|
5674919 |
/net/myserver.
|
|
|
5674919 |
.P
|
|
|
5674919 |
-NOTE: mounts done from a hosts map will be mounted with the "nosuid,nodev,intr" options
|
|
|
5674919 |
-unless overridden by explicitly specifying the "suid", "dev" or "nointr" options in the
|
|
|
5674919 |
+NOTE: mounts done from a hosts map will be mounted with the "nosuid,nodev" options
|
|
|
5674919 |
+unless overridden by explicitly specifying the "suid", "dev" options in the
|
|
|
5674919 |
master map entry.
|
|
|
5674919 |
.SH LDAP MAPS
|
|
|
5674919 |
If the map type \fBldap\fP is specified the mapname is of the form
|
|
|
5674919 |
diff --git a/man/autofs.5 b/man/autofs.5
|
|
|
5674919 |
index d32e772e..569a2683 100644
|
|
|
5674919 |
--- a/man/autofs.5
|
|
|
5674919 |
+++ b/man/autofs.5
|
|
|
5674919 |
@@ -86,13 +86,13 @@ Indirect map:
|
|
|
5674919 |
.RS +.2i
|
|
|
5674919 |
.ta 1.0i 3.0i
|
|
|
5674919 |
.nf
|
|
|
5674919 |
-kernel \-ro,soft,intr ftp.kernel.org:/pub/linux
|
|
|
5674919 |
+kernel \-ro,soft ftp.kernel.org:/pub/linux
|
|
|
5674919 |
boot \-fstype=ext2 :/dev/hda1
|
|
|
5674919 |
windoze \-fstype=smbfs ://windoze/c
|
|
|
5674919 |
removable \-fstype=ext2 :/dev/hdd
|
|
|
5674919 |
cd \-fstype=iso9660,ro :/dev/hdc
|
|
|
5674919 |
floppy \-fstype=auto :/dev/fd0
|
|
|
5674919 |
-server \-rw,hard,intr / \-ro myserver.me.org:/ \\
|
|
|
5674919 |
+server \-rw,hard / \-ro myserver.me.org:/ \\
|
|
|
5674919 |
/usr myserver.me.org:/usr \\
|
|
|
5674919 |
/home myserver.me.org:/home
|
|
|
5674919 |
.fi
|
|
|
5674919 |
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
|
|
|
5674919 |
index 88dde0b2..71867ef1 100644
|
|
|
5674919 |
--- a/modules/parse_sun.c
|
|
|
5674919 |
+++ b/modules/parse_sun.c
|
|
|
5674919 |
@@ -618,10 +618,9 @@ static int sun_mount(struct autofs_point *ap, const char *root,
|
|
|
5674919 |
int len = strlen(options);
|
|
|
5674919 |
int suid = strstr(options, "suid") ? 0 : 7;
|
|
|
5674919 |
int dev = strstr(options, "dev") ? 0 : 6;
|
|
|
5674919 |
- int nointr = strstr(options, "nointr") ? 0 : 5;
|
|
|
5674919 |
|
|
|
5674919 |
- if (suid || dev || nointr) {
|
|
|
5674919 |
- char *tmp = alloca(len + suid + dev + nointr + 1);
|
|
|
5674919 |
+ if (suid || dev) {
|
|
|
5674919 |
+ char *tmp = alloca(len + suid + dev + 1);
|
|
|
5674919 |
if (!tmp) {
|
|
|
5674919 |
error(ap->logopt, MODPREFIX
|
|
|
5674919 |
"alloca failed for options");
|
|
|
5674919 |
@@ -635,8 +634,6 @@ static int sun_mount(struct autofs_point *ap, const char *root,
|
|
|
5674919 |
strcat(tmp, ",nosuid");
|
|
|
5674919 |
if (dev)
|
|
|
5674919 |
strcat(tmp, ",nodev");
|
|
|
5674919 |
- if (nointr)
|
|
|
5674919 |
- strcat(tmp, ",intr");
|
|
|
5674919 |
options = tmp;
|
|
|
5674919 |
}
|
|
|
5674919 |
} else {
|
|
|
5674919 |
@@ -648,7 +645,7 @@ static int sun_mount(struct autofs_point *ap, const char *root,
|
|
|
5674919 |
return -1;
|
|
|
5674919 |
return 1;
|
|
|
5674919 |
}
|
|
|
5674919 |
- strcpy(tmp, "nosuid,nodev,intr");
|
|
|
5674919 |
+ strcpy(tmp, "nosuid,nodev");
|
|
|
5674919 |
options = tmp;
|
|
|
5674919 |
}
|
|
|
5674919 |
}
|
|
|
5674919 |
diff --git a/samples/auto.misc b/samples/auto.misc
|
|
|
5674919 |
index 0ee5e75f..fdda0e73 100644
|
|
|
5674919 |
--- a/samples/auto.misc
|
|
|
5674919 |
+++ b/samples/auto.misc
|
|
|
5674919 |
@@ -6,7 +6,7 @@
|
|
|
5674919 |
cd -fstype=iso9660,ro,nosuid,nodev :/dev/cdrom
|
|
|
5674919 |
|
|
|
5674919 |
# the following entries are samples to pique your imagination
|
|
|
5674919 |
-#linux -ro,soft,intr ftp.example.org:/pub/linux
|
|
|
5674919 |
+#linux -ro,soft ftp.example.org:/pub/linux
|
|
|
5674919 |
#boot -fstype=ext2 :/dev/hda1
|
|
|
5674919 |
#floppy -fstype=auto :/dev/fd0
|
|
|
5674919 |
#floppy -fstype=ext2 :/dev/fd0
|
|
|
5674919 |
diff --git a/samples/auto.net b/samples/auto.net
|
|
|
5674919 |
index 0384f611..c5b145d5 100755
|
|
|
5674919 |
--- a/samples/auto.net
|
|
|
5674919 |
+++ b/samples/auto.net
|
|
|
5674919 |
@@ -9,7 +9,7 @@ key="$1"
|
|
|
5674919 |
|
|
|
5674919 |
# add "nosymlink" here if you want to suppress symlinking local filesystems
|
|
|
5674919 |
# add "nonstrict" to make it OK for some filesystems to not mount
|
|
|
5674919 |
-opts="-fstype=nfs,hard,intr,nodev,nosuid"
|
|
|
5674919 |
+opts="-fstype=nfs,hard,nodev,nosuid"
|
|
|
5674919 |
|
|
|
5674919 |
for P in /bin /sbin /usr/bin /usr/sbin
|
|
|
5674919 |
do
|