Move sun2, sun3 & x68k across to the common distrib etc/services, and

while here reduce it from 1180 to 794 bytes (whitespace & comment cleanup)
This commit is contained in:
abs 2009-09-20 19:41:35 +00:00
parent 5edb620617
commit 52f8f0673d
14 changed files with 97 additions and 274 deletions

View File

@ -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

View File

@ -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 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${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 \

View File

@ -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 @@ COPY ${DESTDIR}/usr/mdec/ufsboot usr/mdec/ufsboot
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

View File

@ -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 @@ MTREECONF= ${.CURDIR}/mtree.conf
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

View File

@ -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 ssh srcdir distrib/utils/ssh
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

View File

@ -1,59 +0,0 @@
#
# etc/services (ramdisk version)
# $NetBSD: services,v 1.1 2002/04/26 03:29:33 lukem Exp $
#
tcpmux 1/tcp
echo 7/tcp
echo 7/udp
discard 9/tcp sink null
discard 9/udp sink null
systat 11/tcp users
daytime 13/tcp
daytime 13/udp
netstat 15/tcp
chargen 19/tcp ttytst source
chargen 19/udp ttytst source
ftp-data 20/tcp
ftp 21/tcp
telnet 23/tcp
smtp 25/tcp mail
time 37/tcp timserver
time 37/udp timserver
nameserver 42/tcp name # IEN 116
whois 43/tcp nicname
domain 53/tcp nameserver
domain 53/udp nameserver
bootps 67/udp
bootpc 68/udp
tftp 69/udp
#
rje 77/tcp netrjs
finger 79/tcp
link 87/tcp ttylink
kerberos 88/tcp krb5 # Kerberos v5
kerberos 88/udp
supdup 95/tcp
# 100 - reserved
hostnames 101/tcp hostname
iso-tsap 102/tcp tsap
#
sunrpc 111/tcp
sunrpc 111/udp
nfs 2049/udp nfsd
nfs 2049/tcp nfsd
#
# UNIX specific services
#
exec 512/tcp
biff 512/udp comsat
login 513/tcp
who 513/udp whod
shell 514/tcp cmd
syslog 514/udp
printer 515/tcp spooler
talk 517/udp
ntalk 518/udp
route 520/udp router routed

View File

@ -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 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${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 \

View File

@ -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 @@ COPY ${DESTDIR}/usr/mdec/ufsboot usr/mdec/ufsboot
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

View File

@ -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 @@ MTREECONF= ${.CURDIR}/mtree.conf
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 -

View File

@ -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 ssh srcdir distrib/utils/ssh
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

View File

@ -1,59 +0,0 @@
#
# etc/services (ramdisk version)
# $NetBSD: services,v 1.1 2002/05/17 17:52:36 lukem Exp $
#
tcpmux 1/tcp
echo 7/tcp
echo 7/udp
discard 9/tcp sink null
discard 9/udp sink null
systat 11/tcp users
daytime 13/tcp
daytime 13/udp
netstat 15/tcp
chargen 19/tcp ttytst source
chargen 19/udp ttytst source
ftp-data 20/tcp
ftp 21/tcp
telnet 23/tcp
smtp 25/tcp mail
time 37/tcp timserver
time 37/udp timserver
nameserver 42/tcp name # IEN 116
whois 43/tcp nicname
domain 53/tcp nameserver
domain 53/udp nameserver
bootps 67/udp
bootpc 68/udp
tftp 69/udp
#
rje 77/tcp netrjs
finger 79/tcp
link 87/tcp ttylink
kerberos 88/tcp krb5 # Kerberos v5
kerberos 88/udp
supdup 95/tcp
# 100 - reserved
hostnames 101/tcp hostname
iso-tsap 102/tcp tsap
#
sunrpc 111/tcp
sunrpc 111/udp
nfs 2049/udp nfsd
nfs 2049/tcp nfsd
#
# UNIX specific services
#
exec 512/tcp
biff 512/udp comsat
login 513/tcp
who 513/udp whod
shell 514/tcp cmd
syslog 514/udp
printer 515/tcp spooler
talk 517/udp
ntalk 518/udp
route 520/udp router routed

View File

@ -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 @@ IMAGEENDIAN= be
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 \

View File

@ -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 @@ LIBS libhack.o -lz -lutil -lcurses -ltermcap -lcrypt -ll -lm -lprop
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

View File

@ -1,59 +0,0 @@
#
# etc/services (ramdisk version)
# $NetBSD: services,v 1.1 2002/05/13 01:04:23 lukem Exp $
#
tcpmux 1/tcp
echo 7/tcp
echo 7/udp
discard 9/tcp sink null
discard 9/udp sink null
systat 11/tcp users
daytime 13/tcp
daytime 13/udp
netstat 15/tcp
chargen 19/tcp ttytst source
chargen 19/udp ttytst source
ftp-data 20/tcp
ftp 21/tcp
telnet 23/tcp
smtp 25/tcp mail
time 37/tcp timserver
time 37/udp timserver
nameserver 42/tcp name # IEN 116
whois 43/tcp nicname
domain 53/tcp nameserver
domain 53/udp nameserver
bootps 67/udp
bootpc 68/udp
tftp 69/udp
#
rje 77/tcp netrjs
finger 79/tcp
link 87/tcp ttylink
kerberos 88/tcp krb5 # Kerberos v5
kerberos 88/udp
supdup 95/tcp
# 100 - reserved
hostnames 101/tcp hostname
iso-tsap 102/tcp tsap
#
sunrpc 111/tcp
sunrpc 111/udp
nfs 2049/udp nfsd
nfs 2049/tcp nfsd
#
# UNIX specific services
#
exec 512/tcp
biff 512/udp comsat
login 513/tcp
who 513/udp whod
shell 514/tcp cmd
syslog 514/udp
printer 515/tcp spooler
talk 517/udp
ntalk 518/udp
route 520/udp router routed