diff options
| -rw-r--r-- | etc/Makefile | 9 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 9 | ||||
| -rw-r--r-- | share/man/man5/Makefile | 5 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 1 | ||||
| -rw-r--r-- | sys/conf/kern.opts.mk | 1 | ||||
| -rw-r--r-- | sys/modules/Makefile | 6 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 20 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_AUTOFS | 4 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 5 |
9 files changed, 52 insertions, 8 deletions
diff --git a/etc/Makefile b/etc/Makefile index 62b837f..b27542a 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -14,8 +14,7 @@ SUBDIR+=sendmail SUBDIR+=tests .endif -BIN1= auto_master \ - crontab \ +BIN1= crontab \ devd.conf \ devfs.conf \ ddb.conf \ @@ -90,6 +89,10 @@ BIN1+= amd.map BIN1+= apmd.conf .endif +.if ${MK_AUTOFS} != "no" +BIN1+= auto_master +.endif + .if ${MK_BSNMP} != "no" BIN1+= snmpd.config .endif @@ -229,7 +232,9 @@ distribution: echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ ) | ${METALOG.add} .endif +.if ${MK_AUTOFS} != "no" ${_+_}cd ${.CURDIR}/autofs; ${MAKE} install +.endif .if ${MK_BLUETOOTH} != "no" ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 21ddb36..2586cbf 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -20,9 +20,6 @@ FILES= DAEMON \ atm3 \ auditd \ auditdistd \ - automount \ - automountd \ - autounmountd \ bgfsck \ ${_bluetooth} \ bootparams \ @@ -158,6 +155,12 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_AUTOFS} != "no" +FILES+= automount +FILES+= automountd +FILES+= autounmountd +.endif + .if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth _bthidd= bthidd diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index e848335..15056f3 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -7,7 +7,6 @@ MAN= acct.5 \ ar.5 \ a.out.5 \ - autofs.5 \ bluetooth.device.conf.5 \ bluetooth.hosts.5 \ bluetooth.protocols.5 \ @@ -80,6 +79,10 @@ MLINKS+=quota.user.5 quota.group.5 MLINKS+=rc.conf.5 rc.conf.local.5 MLINKS+=resolver.5 resolv.conf.5 +.if ${MK_AUTOFS} != "no" +MAN+= autofs.5 +.endif + .if ${MK_FREEBSD_UPDATE} != "no" MAN+= freebsd-update.conf.5 .endif diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index c8c42be..0609a9e 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -52,6 +52,7 @@ __DEFAULT_YES_OPTIONS = \ ATM \ AUDIT \ AUTHPF \ + AUTOFS \ BHYVE \ BINUTILS \ BINUTILS_BOOTSTRAP \ diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index dd74a17..81d91af 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -23,6 +23,7 @@ # src tree. __DEFAULT_YES_OPTIONS = \ + AUTOFS \ BHYVE \ BLUETOOTH \ CCD \ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 2a3da24..7498dab 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -47,7 +47,7 @@ SUBDIR= \ ata \ ath \ ath_pci \ - autofs \ + ${_autofs} \ ${_auxio} \ ${_bce} \ bfe \ @@ -382,6 +382,10 @@ SUBDIR= \ ${_zfs} \ zlib +.if ${MK_AUTOFS} != "no" || defined(ALL_MODULES) +_autofs= autofs +.endif + .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) _crypto= crypto diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f627f1f..b80ca61 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -144,6 +144,26 @@ OLD_FILES+=usr/share/man/man8/authpf.8.gz OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz .endif +.if ${MK_AUTOFS} == no +OLD_FILES+=etc/autofs/include_ldap +OLD_FILES+=etc/autofs/special_hosts +OLD_FILES+=etc/autofs/special_media +OLD_FILES+=etc/autofs/special_null +OLD_FILES+=etc/auto_master +OLD_FILES+=etc/rc.d/automount +OLD_FILES+=etc/rc.d/automountd +OLD_FILES+=etc/rc.d/autounmountd +OLD_FILES+=usr/sbin/automount +OLD_FILES+=usr/sbin/automountd +OLD_FILES+=usr/sbin/autounmountd +OLD_FILES+=usr/share/man/man5/autofs.5.gz +OLD_FILES+=usr/share/man/man5/auto_master.5.gz +OLD_FILES+=usr/share/man/man8/automount.8.gz +OLD_FILES+=usr/share/man/man8/automountd.8.gz +OLD_FILES+=usr/share/man/man8/autounmountd.8.gz +OLD_DIRS+=etc/autofs +.endif + .if ${MK_BHYVE} == no OLD_FILES+=usr/sbin/bhyve OLD_FILES+=usr/sbin/bhyvectl diff --git a/tools/build/options/WITHOUT_AUTOFS b/tools/build/options/WITHOUT_AUTOFS new file mode 100644 index 0000000..f9c5c2c --- /dev/null +++ b/tools/build/options/WITHOUT_AUTOFS @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr autofs 4 +related programs, libraries, and kernel modules. diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 1db4046..79e4909 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -5,7 +5,6 @@ SUBDIR= adduser \ arp \ - autofs \ binmiscctl \ bootparamd \ bsdconfig \ @@ -124,6 +123,10 @@ SUBDIR+= praudit SUBDIR+= authpf .endif +.if ${MK_AUTOFS} != "no" +SUBDIR+= autofs +.endif + .if ${MK_BLUETOOTH} != "no" SUBDIR+= bluetooth .endif |
