Module Name: src
Committed By: roy
Date: Thu Apr 25 08:56:21 UTC 2019
Modified Files:
src/distrib/sets/lists/etc: mi
src/etc/rc.d: Makefile
Log Message:
Don't install YP rc.d files with MKYP=no
To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.100 -r1.101 src/etc/rc.d/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.256 src/distrib/sets/lists/etc/mi:1.257
--- src/distrib/sets/lists/etc/mi:1.256 Wed Apr 10 00:35:25 2019
+++ src/distrib/sets/lists/etc/mi Thu Apr 25 08:56:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.256 2019/04/10 00:35:25 sevan Exp $
+# $NetBSD: mi,v 1.257 2019/04/25 08:56:21 roy Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -318,9 +318,9 @@
./etc/rc.d/wscons etc-sys-rc
./etc/rc.d/wsmoused etc-sys-rc
./etc/rc.d/xntpd etc-obsolete obsolete
-./etc/rc.d/ypbind etc-nis-rc
-./etc/rc.d/yppasswdd etc-nis-rc
-./etc/rc.d/ypserv etc-nis-rc
+./etc/rc.d/ypbind etc-nis-rc yp
+./etc/rc.d/yppasswdd etc-nis-rc yp
+./etc/rc.d/ypserv etc-nis-rc yp
./etc/rc.d/ypset etc-obsolete obsolete
./etc/rc.lkm etc-obsolete obsolete
./etc/rc.local etc-sys-rc
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.100 src/etc/rc.d/Makefile:1.101
--- src/etc/rc.d/Makefile:1.100 Wed Apr 10 00:32:15 2019
+++ src/etc/rc.d/Makefile Thu Apr 25 08:56:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2019/04/10 00:32:15 sevan Exp $
+# $NetBSD: Makefile,v 1.101 2019/04/25 08:56:21 roy Exp $
.include <bsd.own.mk>
@@ -40,11 +40,14 @@ CONFIGFILES=\
savecore screenblank securelevel sshd \
staticroute swap1 swap2 sysctl sysdb syslogd \
timed tpctl ttys \
- veriexec virecover wdogctl wpa_supplicant wscons wsmoused \
- ypbind yppasswdd ypserv
+ veriexec virecover wdogctl wpa_supplicant wscons wsmouse
FILESDIR= /etc/rc.d
FILESMODE= ${BINMODE}
+.if ${MKYP} != "no"
+CONFIGFILES+= ypbind yppasswdd ypserv
+.endif
+
.if ${MKX11} != "no"
CONFIGFILES+= xdm xfs fccache
FILESBUILD_xdm= yes
