upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 22:32:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

autofs: media: Don't include nosuid in the script

Browse source 
We already have nosuid option in auto_master so no need to redefine it.
Also it's easier for a user to modify the auto_master configuration file
than the script (which shouldn't be modified).

Sponsored by:	Beckhoff Automation GmbH & Co. KG
Differential Revision:	https://reviews.freebsd.org/D42492
Reviewed by:	rew

(cherry picked from commit 0b7c89c8c2)
This commit is contained in:
Emmanuel Vadot 2023-11-07 10:42:53 +01:00
parent 2057bf194a
commit 3247c29e92
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
usr.sbin/autofs/autofs/special_media
View file

@ -40,7 +40,7 @@ print_map_entry() {
case "${_fstype}" in
"exfat")
if [ -f "/usr/local/sbin/mount.exfat" ]; then
echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype},nosuid :/dev/${_p}"
echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype} :/dev/${_p}"
else
/usr/bin/logger -p info -t "special_media[$$]" \
"Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-exfat first"
@ -49,7 +49,7 @@ print_map_entry() {
;;
"ntfs")
if [ -f "/usr/local/bin/ntfs-3g" ]; then
echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid :/dev/${_p}"
echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype} :/dev/${_p}"
else
/usr/bin/logger -p info -t "special_media[$$]" \
"Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-ntfs first"
@ -57,10 +57,10 @@ print_map_entry() {
fi
;;
"ext2fs" | "msdosfs")
echo "-fstype=${_fstype},nosuid,async :/dev/${_p}"
echo "-fstype=${_fstype},async :/dev/${_p}"
;;
*)
echo "-fstype=${_fstype},nosuid :/dev/${_p}"
echo "-fstype=${_fstype} :/dev/${_p}"
;;
esac
}