From faf9ccbc07bb2e044fdce56975887d5a9563ac37 Mon Sep 17 00:00:00 2001 From: tedu <> Date: Sun, 24 Aug 2003 06:21:56 +0000 Subject: [PATCH] put emul sysctls in appropriate arch. also fix up the comments. problems noted by fgsch@ and deraadt@ --- src/etc/etc.alpha/sysctl.conf | 2 ++ src/etc/etc.hp300/sysctl.conf | 2 ++ src/etc/etc.i386/sysctl.conf | 6 ++++++ src/etc/etc.mac68k/sysctl.conf | 1 + src/etc/etc.mvme68k/sysctl.conf | 2 ++ src/etc/etc.sparc/sysctl.conf | 2 ++ src/etc/etc.vax/sysctl.conf | 1 + src/etc/sysctl.conf | 15 +-------------- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/etc/etc.alpha/sysctl.conf b/src/etc/etc.alpha/sysctl.conf index 5830d5f8..08ad51c1 100644 --- a/src/etc/etc.alpha/sysctl.conf +++ b/src/etc/etc.alpha/sysctl.conf @@ -2,3 +2,5 @@ #machdep.unaligned_fix=0 # 0 - disable fixup of unaligned access #machdep.unaligned_sigbus=0 # 0 - don't sigbus on unaligned access #machdep.allowaperture=1 # see xf86(4) +#kern.emul.netbsd=1 # enable running NetBSD Elf64 binaries +#kern.emul.osf1=1 # enable running OSF/1 binaries diff --git a/src/etc/etc.hp300/sysctl.conf b/src/etc/etc.hp300/sysctl.conf index e69de29b..dd7f6285 100644 --- a/src/etc/etc.hp300/sysctl.conf +++ b/src/etc/etc.hp300/sysctl.conf @@ -0,0 +1,2 @@ +#kern.emul.hpux=1 # enable running HP/UX binaries +#kern.emul.sunos=1 # enable running SunOS binaries diff --git a/src/etc/etc.i386/sysctl.conf b/src/etc/etc.i386/sysctl.conf index fbea664a..781f888b 100644 --- a/src/etc/etc.i386/sysctl.conf +++ b/src/etc/etc.i386/sysctl.conf @@ -4,3 +4,9 @@ #machdep.kbdreset=1 # permit console CTRL-ALT-DEL to do a nice halt #machdep.userldt=1 # allow userland programs to play with ldt, # required by some ports +#kern.emul.aout=1 # enable running dynamic OpenBSD a.out bins +#kern.emul.bsdos=1 # enable running BSD/OS binaries +#kern.emul.freebsd=1 # enable running FreeBSD binaries +#kern.emul.ibcs2=1 # enable running iBCS2 binaries +#kern.emul.linux=1 # enable running Linux binaries +#kern.emul.svr4=1 # enable running SVR4 binaries diff --git a/src/etc/etc.mac68k/sysctl.conf b/src/etc/etc.mac68k/sysctl.conf index e69de29b..06256a46 100644 --- a/src/etc/etc.mac68k/sysctl.conf +++ b/src/etc/etc.mac68k/sysctl.conf @@ -0,0 +1 @@ +#kern.emul.sunos=1 # enable running SunOS binaries diff --git a/src/etc/etc.mvme68k/sysctl.conf b/src/etc/etc.mvme68k/sysctl.conf index e69de29b..dd7f6285 100644 --- a/src/etc/etc.mvme68k/sysctl.conf +++ b/src/etc/etc.mvme68k/sysctl.conf @@ -0,0 +1,2 @@ +#kern.emul.hpux=1 # enable running HP/UX binaries +#kern.emul.sunos=1 # enable running SunOS binaries diff --git a/src/etc/etc.sparc/sysctl.conf b/src/etc/etc.sparc/sysctl.conf index 50e54ded..8e573274 100644 --- a/src/etc/etc.sparc/sysctl.conf +++ b/src/etc/etc.sparc/sysctl.conf @@ -1 +1,3 @@ #machdep.led_blink=1 # 1=On sparc, make led(s) blink +#kern.emul.sunos=1 # enable running SunOS binaries +#kern.emul.svr4=1 # enable running SVR4 binaries diff --git a/src/etc/etc.vax/sysctl.conf b/src/etc/etc.vax/sysctl.conf index e69de29b..c9f4a049 100644 --- a/src/etc/etc.vax/sysctl.conf +++ b/src/etc/etc.vax/sysctl.conf @@ -0,0 +1 @@ +#kern.emul.ultrix=1 # enable running Ultrix binaries diff --git a/src/etc/sysctl.conf b/src/etc/sysctl.conf index 5306d4dc..96f25206 100644 --- a/src/etc/sysctl.conf +++ b/src/etc/sysctl.conf @@ -1,4 +1,4 @@ -# $OpenBSD: sysctl.conf,v 1.29 2003/08/23 19:33:08 tedu Exp $ +# $OpenBSD: sysctl.conf,v 1.30 2003/08/24 06:21:56 tedu Exp $ # # This file contains a list of sysctl options the user wants set at # boot time. See sysctl(3) and sysctl(8) for more information on @@ -20,16 +20,3 @@ #net.inet.ip.mtudisc=0 # 0=disable tcp mtu discovery #kern.usercrypto=1 # 1=enable userland use of /dev/crypto #kern.splassert=2 # 2=enable and verbose error messages. -# Emulations, uncomment to enable -#kern.emul.aout=1 -#kern.emul.bsdos=1 -#kern.emul.freebsd=1 -#kern.emul.hpux=1 -#kern.emul.ibcs2=1 -#kern.emul.linux=1 -#kern.emul.netbsd=1 -#kern.emul.osf1=1 -#kern.emul.sunos=1 -#kern.emul.svr4=1 -#kern.emul.ultrix=1 -