Module Name: src
Committed By: abs
Date: Sun Sep 20 19:41:36 UTC 2009
Modified Files:
src/distrib/common: services
src/distrib/sun2/miniroot: Makefile list
src/distrib/sun2/ramdisk: Makefile list
src/distrib/sun3/miniroot: Makefile list
src/distrib/sun3/ramdisk: Makefile list
src/distrib/x68k/floppies/ramdisk: Makefile list
Removed Files:
src/distrib/sun2/ramdisk: services
src/distrib/sun3/ramdisk: services
src/distrib/x68k/floppies/ramdisk: services
Log Message:
Move sun2, sun3 & x68k across to the common distrib etc/services, and
while here reduce it from 1180 to 794 bytes (whitespace & comment cleanup)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/common/services
cvs rdiff -u -r1.28 -r1.29 src/distrib/sun2/miniroot/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/sun2/miniroot/list
cvs rdiff -u -r1.21 -r1.22 src/distrib/sun2/ramdisk/Makefile
cvs rdiff -u -r1.8 -r1.9 src/distrib/sun2/ramdisk/list
cvs rdiff -u -r1.1 -r0 src/distrib/sun2/ramdisk/services
cvs rdiff -u -r1.39 -r1.40 src/distrib/sun3/miniroot/Makefile
cvs rdiff -u -r1.19 -r1.20 src/distrib/sun3/miniroot/list
cvs rdiff -u -r1.36 -r1.37 src/distrib/sun3/ramdisk/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/sun3/ramdisk/list
cvs rdiff -u -r1.1 -r0 src/distrib/sun3/ramdisk/services
cvs rdiff -u -r1.32 -r1.33 src/distrib/x68k/floppies/ramdisk/Makefile
cvs rdiff -u -r1.23 -r1.24 src/distrib/x68k/floppies/ramdisk/list
cvs rdiff -u -r1.1 -r0 src/distrib/x68k/floppies/ramdisk/services
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/services
diff -u src/distrib/common/services:1.3 src/distrib/common/services:1.4
--- src/distrib/common/services:1.3 Fri Apr 11 12:54:35 2008
+++ src/distrib/common/services Sun Sep 20 19:41:35 2009
@@ -1,47 +1,47 @@
-# $NetBSD: services,v 1.3 2008/04/11 12:54:35 rafal Exp $
-# A minimal /etc/services file for install floppies.
-ftp-data 20/tcp
-ftp-data 20/udp
-ftp 21/tcp
-ftp 21/udp
-bootps 67/tcp
-bootps 67/udp
-bootpc 68/tcp
-bootpc 68/udp
-tftp 69/tcp
-tftp 69/udp
-http 80/tcp
-sunrpc 111/tcp
-sunrpc 111/udp
-sftp 115/tcp
-sftp 115/udp
-mftp 349/tcp
-mftp 349/udp
-shell 514/tcp # aka rsh
-kshell 544/tcp
-kshell 544/udp
-dhcpv6-client 546/tcp
-dhcpv6-client 546/udp
-dhcpv6-server 547/tcp
-dhcpv6-server 547/udp
-ftp-agent 574/tcp
-ftp-agent 574/udp
-dhcp-failover 647/tcp
-dhcp-failover 647/udp
-ftps-data 989/tcp
-ftps-data 989/udp
-ftps 990/tcp
-ftps 990/udp
-tftp-mcast 1758/tcp
-tftp-mcast 1758/udp
-nfs 2049/tcp
-nfs 2049/udp
-tftps 3713/tcp
-tftps 3713/udp
-kftp-data 6620/tcp
-kftp-data 6620/udp
-kftp 6621/tcp
-kftp 6621/udp
-mcftp 6622/tcp
-mcftp 6622/udp
+# $NetBSD: services,v 1.4 2009/09/20 19:41:35 abs Exp $
+# Minimal /etc/services file for install
+ftp-data 20/tcp
+ftp-data 20/udp
+ftp 21/tcp
+ftp 21/udp
+bootps 67/tcp
+bootps 67/udp
+bootpc 68/tcp
+bootpc 68/udp
+tftp 69/tcp
+tftp 69/udp
+http 80/tcp
+sunrpc 111/tcp
+sunrpc 111/udp
+sftp 115/tcp
+sftp 115/udp
+mftp 349/tcp
+mftp 349/udp
+shell 514/tcp
+kshell 544/tcp
+kshell 544/udp
+dhcpv6-client 546/tcp
+dhcpv6-client 546/udp
+dhcpv6-server 547/tcp
+dhcpv6-server 547/udp
+ftp-agent 574/tcp
+ftp-agent 574/udp
+dhcp-failover 647/tcp
+dhcp-failover 647/udp
+ftps-data 989/tcp
+ftps-data 989/udp
+ftps 990/tcp
+ftps 990/udp
+tftp-mcast 1758/tcp
+tftp-mcast 1758/udp
+nfs 2049/tcp
+nfs 2049/udp
+tftps 3713/tcp
+tftps 3713/udp
+kftp-data 6620/tcp
+kftp-data 6620/udp
+kftp 6621/tcp
+kftp 6621/udp
+mcftp 6622/tcp
+mcftp 6622/udp
Index: src/distrib/sun2/miniroot/Makefile
diff -u src/distrib/sun2/miniroot/Makefile:1.28 src/distrib/sun2/miniroot/Makefile:1.29
--- src/distrib/sun2/miniroot/Makefile:1.28 Sun Jan 25 22:08:39 2009
+++ src/distrib/sun2/miniroot/Makefile Sun Sep 20 19:41:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/01/25 22:08:39 abs Exp $
+# $NetBSD: Makefile,v 1.29 2009/09/20 19:41:35 abs Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,8 +29,8 @@
${DESTDIR}/etc/disktab ${DESTDIR}/etc/group \
${DESTDIR}/etc/master.passwd ${DESTDIR}/etc/netconfig \
${DESTDIR}/etc/passwd \
- ${NETBSDSRCDIR}/distrib/common/protocols \
- ${DESTDIR}/etc/pwd.db ${NETBSDSRCDIR}/distrib/common/services \
+ ${DISTRIBDIR}/common/protocols \
+ ${DESTDIR}/etc/pwd.db ${DISTRIBDIR}/common/services \
${DESTDIR}/etc/spwd.db \
${DESTDIR}/usr/mdec/bootxx ${DESTDIR}/usr/mdec/bootyy \
${DESTDIR}/usr/mdec/netboot ${DESTDIR}/usr/mdec/tapeboot \
Index: src/distrib/sun2/miniroot/list
diff -u src/distrib/sun2/miniroot/list:1.10 src/distrib/sun2/miniroot/list:1.11
--- src/distrib/sun2/miniroot/list:1.10 Fri Sep 18 10:49:09 2009
+++ src/distrib/sun2/miniroot/list Sun Sep 20 19:41:35 2009
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.10 2009/09/18 10:49:09 abs Exp $
+# $NetBSD: list,v 1.11 2009/09/20 19:41:35 abs Exp $
#
# The PROM provides a default kernel name of "vmunix"
@@ -20,14 +20,14 @@
LINK usr/mdec/ufsboot ufsboot
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/group etc/group
-COPY ${DESTDIR}/etc/master.passwd etc/master.passwd
-COPY ${DESTDIR}/etc/netconfig etc/netconfig
-COPY ${DESTDIR}/etc/passwd etc/passwd
-COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols
-COPY ${DESTDIR}/etc/pwd.db etc/pwd.db
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-COPY ${NETBSDSRCDIR}/distrib/common/services etc/services
+COPY ${DESTDIR}/etc/group etc/group
+COPY ${DESTDIR}/etc/master.passwd etc/master.passwd
+COPY ${DESTDIR}/etc/netconfig etc/netconfig
+COPY ${DESTDIR}/etc/passwd etc/passwd
+COPY ${DISTRIBDIR}/common/protocols etc/protocols
+COPY ${DESTDIR}/etc/pwd.db etc/pwd.db
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+COPY ${DISTRIBDIR}/common/services etc/services
# some /etc files get special handling (for MFS /tmp yuck)
COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
Index: src/distrib/sun2/ramdisk/Makefile
diff -u src/distrib/sun2/ramdisk/Makefile:1.21 src/distrib/sun2/ramdisk/Makefile:1.22
--- src/distrib/sun2/ramdisk/Makefile:1.21 Mon Jun 2 09:04:51 2008
+++ src/distrib/sun2/ramdisk/Makefile Sun Sep 20 19:41:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/06/02 09:04:51 he Exp $
+# $NetBSD: Makefile,v 1.22 2009/09/20 19:41:35 abs Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,8 +17,8 @@
IMAGEENDIAN= be
MAKEDEVTARGETS= std md0 cd0 st0 st1 sd0 sd1 sd2 xd0 xy0
IMAGEDEPENDS= ${CRUNCHBIN} \
- disktab fstab passwd protocols services sshrc welcome \
- ${NETBSDSRCDIR}/etc/netconfig
+ disktab fstab passwd protocols ${DISTRIBDIR}/common/services \
+ sshrc welcome ${NETBSDSRCDIR}/etc/netconfig
MDSETTARGETS= RAMDISK ramdisk.fs -
MDSET_RELEASEDIR= binary/kernel
Index: src/distrib/sun2/ramdisk/list
diff -u src/distrib/sun2/ramdisk/list:1.8 src/distrib/sun2/ramdisk/list:1.9
--- src/distrib/sun2/ramdisk/list:1.8 Tue May 6 15:32:07 2008
+++ src/distrib/sun2/ramdisk/list Sun Sep 20 19:41:35 2009
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.8 2008/05/06 15:32:07 dyoung Exp $
+# $NetBSD: list,v 1.9 2009/09/20 19:41:35 abs Exp $
#
# ramdisk/list - packing list for the ramdisk.
#
@@ -89,13 +89,13 @@
SPECIAL umount srcdir distrib/utils/x_umount
# various files that we need in /etc for the install
-COPY ${CURDIR}/disktab etc/disktab
-COPY ${CURDIR}/fstab etc/fstab
-COPY ${CURDIR}/passwd etc/passwd
-COPY ${CURDIR}/protocols etc/protocols
-COPY ${CURDIR}/services etc/services
-COPY ${CURDIR}/sshrc .sshrc
-COPY ${CURDIR}/welcome .welcome
+COPY ${CURDIR}/disktab etc/disktab
+COPY ${CURDIR}/fstab etc/fstab
+COPY ${CURDIR}/passwd etc/passwd
+COPY ${CURDIR}/protocols etc/protocols
+COPY ${DISTRIBDIR}/common/services etc/services
+COPY ${CURDIR}/sshrc .sshrc
+COPY ${CURDIR}/welcome .welcome
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
Index: src/distrib/sun3/miniroot/Makefile
diff -u src/distrib/sun3/miniroot/Makefile:1.39 src/distrib/sun3/miniroot/Makefile:1.40
--- src/distrib/sun3/miniroot/Makefile:1.39 Sun Jan 25 22:08:39 2009
+++ src/distrib/sun3/miniroot/Makefile Sun Sep 20 19:41:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/01/25 22:08:39 abs Exp $
+# $NetBSD: Makefile,v 1.40 2009/09/20 19:41:35 abs Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -30,8 +30,8 @@
${DESTDIR}/etc/disktab ${DESTDIR}/etc/group \
${DESTDIR}/etc/master.passwd ${DESTDIR}/etc/netconfig \
${DESTDIR}/etc/passwd \
- ${NETBSDSRCDIR}/distrib/common/protocols \
- ${DESTDIR}/etc/pwd.db ${NETBSDSRCDIR}/distrib/common/services \
+ ${DISTRIBDIR}/common/protocols \
+ ${DESTDIR}/etc/pwd.db ${DISTRIBDIR}/common/services \
${DESTDIR}/etc/spwd.db \
${DESTDIR}/usr/mdec/bootxx \
${DESTDIR}/usr/mdec/netboot ${DESTDIR}/usr/mdec/tapeboot \
Index: src/distrib/sun3/miniroot/list
diff -u src/distrib/sun3/miniroot/list:1.19 src/distrib/sun3/miniroot/list:1.20
--- src/distrib/sun3/miniroot/list:1.19 Fri Sep 18 10:49:09 2009
+++ src/distrib/sun3/miniroot/list Sun Sep 20 19:41:35 2009
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.19 2009/09/18 10:49:09 abs Exp $
+# $NetBSD: list,v 1.20 2009/09/20 19:41:35 abs Exp $
#
COPY ${KERNEL3} netbsd.sun3
@@ -19,14 +19,14 @@
LINK usr/mdec/ufsboot ufsboot
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/group etc/group
-COPY ${DESTDIR}/etc/master.passwd etc/master.passwd
-COPY ${DESTDIR}/etc/netconfig etc/netconfig
-COPY ${DESTDIR}/etc/passwd etc/passwd
-COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols
-COPY ${DESTDIR}/etc/pwd.db etc/pwd.db
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-COPY ${NETBSDSRCDIR}/distrib/common/services etc/services
+COPY ${DESTDIR}/etc/group etc/group
+COPY ${DESTDIR}/etc/master.passwd etc/master.passwd
+COPY ${DESTDIR}/etc/netconfig etc/netconfig
+COPY ${DESTDIR}/etc/passwd etc/passwd
+COPY ${DISTRIBDIR}/common/protocols etc/protocols
+COPY ${DESTDIR}/etc/pwd.db etc/pwd.db
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+COPY ${DISTRIBDIR}/common/services etc/services
# some /etc files get special handling (for MFS /tmp yuck)
COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
Index: src/distrib/sun3/ramdisk/Makefile
diff -u src/distrib/sun3/ramdisk/Makefile:1.36 src/distrib/sun3/ramdisk/Makefile:1.37
--- src/distrib/sun3/ramdisk/Makefile:1.36 Fri May 16 15:16:15 2008
+++ src/distrib/sun3/ramdisk/Makefile Sun Sep 20 19:41:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/05/16 15:16:15 he Exp $
+# $NetBSD: Makefile,v 1.37 2009/09/20 19:41:35 abs Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,8 +17,8 @@
IMAGEENDIAN= be
MAKEDEVTARGETS= std md0 cd0 st0 st1 sd0 sd1 sd2 xd0 xy0 fd0
IMAGEDEPENDS= ${CRUNCHBIN} \
- disktab fstab passwd protocols services sshrc welcome \
- ${NETBSDSRCDIR}/etc/netconfig
+ disktab fstab passwd protocols ${DISTRIBDIR}/common/services \
+ sshrc welcome ${NETBSDSRCDIR}/etc/netconfig
MDSETTARGETS= RAMDISK ramdisk.fs - \
RAMDISK3X ramdisk.fs -
Index: src/distrib/sun3/ramdisk/list
diff -u src/distrib/sun3/ramdisk/list:1.4 src/distrib/sun3/ramdisk/list:1.5
--- src/distrib/sun3/ramdisk/list:1.4 Tue May 6 15:32:07 2008
+++ src/distrib/sun3/ramdisk/list Sun Sep 20 19:41:35 2009
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.4 2008/05/06 15:32:07 dyoung Exp $
+# $NetBSD: list,v 1.5 2009/09/20 19:41:35 abs Exp $
#
# ramdisk/list - packing list for the ramdisk.
#
@@ -89,13 +89,13 @@
SPECIAL umount srcdir distrib/utils/x_umount
# various files that we need in /etc for the install
-COPY ${CURDIR}/disktab etc/disktab
-COPY ${CURDIR}/fstab etc/fstab
-COPY ${CURDIR}/passwd etc/passwd
-COPY ${CURDIR}/protocols etc/protocols
-COPY ${CURDIR}/services etc/services
-COPY ${CURDIR}/sshrc .sshrc
-COPY ${CURDIR}/welcome .welcome
+COPY ${CURDIR}/disktab etc/disktab
+COPY ${CURDIR}/fstab etc/fstab
+COPY ${CURDIR}/passwd etc/passwd
+COPY ${CURDIR}/protocols etc/protocols
+COPY ${DISTRIBDIR}/common/services etc/services
+COPY ${CURDIR}/sshrc .sshrc
+COPY ${CURDIR}/welcome .welcome
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
Index: src/distrib/x68k/floppies/ramdisk/Makefile
diff -u src/distrib/x68k/floppies/ramdisk/Makefile:1.32 src/distrib/x68k/floppies/ramdisk/Makefile:1.33
--- src/distrib/x68k/floppies/ramdisk/Makefile:1.32 Sun Sep 20 19:29:27 2009
+++ src/distrib/x68k/floppies/ramdisk/Makefile Sun Sep 20 19:41:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/09/20 19:29:27 abs Exp $
+# $NetBSD: Makefile,v 1.33 2009/09/20 19:41:35 abs Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -19,7 +19,7 @@
MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS+= ${CRUNCHBIN} \
disktab.preinstall dot.profile \
- services termcap.vt \
+ ${DISTRIBDIR}/common/services termcap.vt \
${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/mboot \
${DESTDIR}/usr/mdec/sdboot_ufs \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
Index: src/distrib/x68k/floppies/ramdisk/list
diff -u src/distrib/x68k/floppies/ramdisk/list:1.23 src/distrib/x68k/floppies/ramdisk/list:1.24
--- src/distrib/x68k/floppies/ramdisk/list:1.23 Sun Sep 20 19:29:27 2009
+++ src/distrib/x68k/floppies/ramdisk/list Sun Sep 20 19:41:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.23 2009/09/20 19:29:27 abs Exp $
+# $NetBSD: list,v 1.24 2009/09/20 19:41:35 abs Exp $
SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/x68k/stand
@@ -70,8 +70,8 @@
COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd
COPY ${NETBSDSRCDIR}/etc/group etc/group
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
-COPY ${NETBSDSRCDIR}/distrib/common/protocols etc/protocols
-COPY ${CURDIR}/services etc/services
+COPY ${DISTRIBDIR}/common/protocols etc/protocols
+COPY ${DISTRIBDIR}/common/services etc/services
# we need the boot blocks in /usr/mdec
COPY ${DESTDIR}/usr/mdec/xxboot_ufs usr/mdec/xxboot_ufs
