From f497eb059cfe99b1b9b7940e7ec09569849cc205 Mon Sep 17 00:00:00 2001 From: tedu <> Date: Mon, 4 Jul 2011 23:03:06 +0000 Subject: [PATCH] remove svr4 compat references --- src/etc/etc.i386/sysctl.conf | 1 - src/etc/etc.sparc/sysctl.conf | 1 - src/etc/etc.svr4/SVR4_MAKEDEV | 105 --------------------------------- src/etc/etc.svr4/fbtab | 0 src/etc/etc.svr4/netconfig | 11 ---- src/etc/etc.svr4/nsswitch.conf | 16 ----- 6 files changed, 134 deletions(-) delete mode 100644 src/etc/etc.svr4/SVR4_MAKEDEV delete mode 100644 src/etc/etc.svr4/fbtab delete mode 100644 src/etc/etc.svr4/netconfig delete mode 100644 src/etc/etc.svr4/nsswitch.conf diff --git a/src/etc/etc.i386/sysctl.conf b/src/etc/etc.i386/sysctl.conf index d6288520..e9dc4cf0 100644 --- a/src/etc/etc.i386/sysctl.conf +++ b/src/etc/etc.i386/sysctl.conf @@ -6,4 +6,3 @@ # required by some ports #kern.emul.aout=1 # enable running dynamic OpenBSD a.out bins #kern.emul.linux=1 # enable running Linux binaries -#kern.emul.svr4=1 # enable running SVR4 binaries diff --git a/src/etc/etc.sparc/sysctl.conf b/src/etc/etc.sparc/sysctl.conf index 522a926a..50e54ded 100644 --- a/src/etc/etc.sparc/sysctl.conf +++ b/src/etc/etc.sparc/sysctl.conf @@ -1,2 +1 @@ #machdep.led_blink=1 # 1=On sparc, make led(s) blink -#kern.emul.svr4=1 # enable running SVR4 binaries diff --git a/src/etc/etc.svr4/SVR4_MAKEDEV b/src/etc/etc.svr4/SVR4_MAKEDEV deleted file mode 100644 index 29ef2957..00000000 --- a/src/etc/etc.svr4/SVR4_MAKEDEV +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -# $OpenBSD: SVR4_MAKEDEV,v 1.6 2003/04/10 22:42:29 millert Exp $ -# $NetBSD: SVR4_MAKEDEV,v 1.3 1996/04/11 12:59:45 christos Exp $ -# -# Copyright (c) 1995 Christos Zoulas -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Device "make" file. Valid arguments: -# all everything -# Network: -# udp UDP socket creation -# tcp TCP socket creation -# rawip RAW socket creation -# ticlts UNIX datagram creation -# ticotsord UNIX stream creation (with orderly release) -# ticots UNIX stream creation -# Various: -# wabi Windows emulation; /dev/null for now -# -PATH=/sbin:/bin/:/usr/bin:/usr/sbin:/usr/etc -umask 77 - -for i -do - -unit=`expr $i : '[a-z][a-z]*\([0-9][0-9]*\)'` -[ "$unit" ] || unit=0 - -case $i in - -all) - sh SVR4_MAKEDEV tcp udp rawip ticlts ticotsord ticots wabi - ;; -tcp) - mknod $i c 43 35 - chown bin:bin $i - chmod 666 $i - ;; - - -udp) - mknod udp c 43 36 - chown bin:bin $i - chmod 666 $i - ;; - -rawip) - mknod $i c 43 37 - chown bin:bin $i - chmod 666 $i - ;; - -ticlts) - mknod $i c 43 38 - chown bin:bin $i - chmod 666 $i - ;; - -ticotsord) - mknod $i c 43 39 - chown bin:bin $i - chmod 666 $i - ;; - -ticots) - mknod $i c 43 40 - chown bin:bin $i - chmod 666 $i - ;; - - -wabi) - mknod $i c 3 2 # /dev/null - chown bin:bin $i - chmod 666 $i - ;; - -*) - echo $i: unknown device - ;; -esac -done - diff --git a/src/etc/etc.svr4/fbtab b/src/etc/etc.svr4/fbtab deleted file mode 100644 index e69de29b..00000000 diff --git a/src/etc/etc.svr4/netconfig b/src/etc/etc.svr4/netconfig deleted file mode 100644 index 7b62e5b5..00000000 --- a/src/etc/etc.svr4/netconfig +++ /dev/null @@ -1,11 +0,0 @@ -# $OpenBSD: netconfig,v 1.4 2002/06/09 06:15:15 todd Exp $ -# $NetBSD: netconfig,v 1.2 1996/04/11 12:59:47 christos Exp $ -# SVR4 Network configuration file -# -# service name fl family proto device library -udp tpi_clts v inet udp /dev/udp - -tcp tpi_cots_ord v inet tcp /dev/tcp - -rawip tpi_raw - inet - /dev/rawip - -ticlts tpi_clts v loopback - /dev/ticlts straddr.so -ticotsord tpi_cots_ord v loopback - /dev/ticotsord straddr.so -ticots tpi_cots v loopback - /dev/ticots straddr.so diff --git a/src/etc/etc.svr4/nsswitch.conf b/src/etc/etc.svr4/nsswitch.conf deleted file mode 100644 index abf0edce..00000000 --- a/src/etc/etc.svr4/nsswitch.conf +++ /dev/null @@ -1,16 +0,0 @@ -# $OpenBSD: nsswitch.conf,v 1.4 2005/02/07 06:08:10 david Exp $ -# $NetBSD: nsswitch.conf,v 1.1 1995/07/02 06:29:51 christos Exp $ -# Name service switch file -# -hosts: dns files -networks: nis files -protocols: nis files -ethers: nis files -rpc: nis files -netmasks: nis files -bootparams: nis files -services: files nis -# -passwd: files nis -group: files nis -netgroup: nis files