diff options
author | dim <dim@FreeBSD.org> | 2015-03-14 13:08:00 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-03-14 13:08:00 +0000 |
commit | 49820c9622102284e7ebb0dfd5599d53dce6571c (patch) | |
tree | d0e744ecfd1d272dd31501aae2c1ef4fa77a13f8 /etc | |
parent | d6cbc26f7849e837bc29f43ea2b6d0a007ac4204 (diff) | |
parent | 470fe38d1f7205106865f5e7622c7a08d45eb0a2 (diff) | |
download | FreeBSD-src-49820c9622102284e7ebb0dfd5599d53dce6571c.zip FreeBSD-src-49820c9622102284e7ebb0dfd5599d53dce6571c.tar.gz |
Merge ^/head r279893 through r279984.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/auto_master | 1 | ||||
-rw-r--r-- | etc/autofs/Makefile | 2 | ||||
-rwxr-xr-x | etc/autofs/special_noauto | 29 | ||||
-rw-r--r-- | etc/defaults/periodic.conf | 2 |
4 files changed, 32 insertions, 2 deletions
diff --git a/etc/auto_master b/etc/auto_master index 0083b18..255b7f8 100644 --- a/etc/auto_master +++ b/etc/auto_master @@ -6,3 +6,4 @@ # When using the -media special map, make sure to edit devd.conf(5) # to move the call to "automount -c" out of the comments section. #/media -media -nosuid +#/- -noauto diff --git a/etc/autofs/Makefile b/etc/autofs/Makefile index 3aa7e03..6d1c9e8 100644 --- a/etc/autofs/Makefile +++ b/etc/autofs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -FILES= include_ldap special_hosts special_media special_null +FILES= include_ldap special_hosts special_media special_noauto special_null NO_OBJ= FILESDIR= /etc/autofs diff --git a/etc/autofs/special_noauto b/etc/autofs/special_noauto new file mode 100755 index 0000000..219ec7e --- /dev/null +++ b/etc/autofs/special_noauto @@ -0,0 +1,29 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +print_available() { + sed 's/#.*//' /etc/fstab | awk '$4 ~ /noauto/ { print $2 }' +} + +print_one() { + local _mntpoint + + _mntpoint="${1%/}" + + sed 's/#.*//' /etc/fstab | awk ' + $2 == "'"${_mntpoint}"'" && $4 ~ /noauto/ { + if ($1 ~ /:/) { dev=$1 } else { dev=":"$1 } + print "-fstype=" $3 "," $4, dev + }' +} + +if [ $# -eq 0 ]; then + print_available + exit 0 +fi + +print_one "$1" +exit 0 + diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf index 4324cfa..97519ca 100644 --- a/etc/defaults/periodic.conf +++ b/etc/defaults/periodic.conf @@ -89,7 +89,7 @@ daily_news_expire_enable="YES" # Run news.expire # 400.status-disks daily_status_disks_enable="YES" # Check disk status -daily_status_disks_df_flags="-l -h" # df(1) flags for check +daily_status_disks_df_flags="-l -h" # df(1) flags for check # 401.status-graid daily_status_graid_enable="NO" # Check graid(8) |