From ed24981d4fb631909783798317f3e7ea3230c2e1 Mon Sep 17 00:00:00 2001 From: yar Date: Fri, 21 Jul 2006 15:55:18 +0000 Subject: Since Alpha support isn't in HEAD anymore, remove Alpha-specific rc.conf(5) knobs, too: osf1_enable, unaligned_print. --- etc/defaults/rc.conf | 2 -- etc/rc.d/archdep | 25 ------------------------- share/man/man5/rc.conf.5 | 13 ------------- 3 files changed, 40 deletions(-) diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 1bd2af7..799dff90 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -482,7 +482,6 @@ sysvipc_enable="NO" # Load System V IPC primitives at startup (or NO). linux_enable="NO" # Linux binary compatibility loaded at startup (or NO). svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO). -osf1_enable="NO" # Alpha OSF/1 emulation loaded at startup (or NO). clear_tmp_enable="NO" # Clear /tmp at startup. clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks @@ -502,7 +501,6 @@ kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure # in the system booting with securelevel set to 1, as # init(8) will raise the level when rc(8) completes. update_motd="YES" # update version info in /etc/motd (or NO) -unaligned_print="YES" # print unaligned access warnings on the alpha (or NO). entropy_file="/entropy" # Set to NO to disable caching entropy through reboots. # /var/db/entropy-file is preferred if / is not avail. entropy_dir="/var/db/entropy" # Set to NO to disable caching entropy via cron. diff --git a/etc/rc.d/archdep b/etc/rc.d/archdep index 0d34c43..a53cf8d 100644 --- a/etc/rc.d/archdep +++ b/etc/rc.d/archdep @@ -13,27 +13,6 @@ name=archdep start_cmd="archdep_start" stop_cmd=":" -# should we print out unaligned access warnings? -# -unaligned_warnings() -{ - if ! checkyesno unaligned_print; then - sysctl machdep.unaligned_print=0 - fi -} - -# Alpha OSF/1 binary emulation -# -osf1_compat() -{ - if checkyesno osf1_enable; then - echo -n ' OSF/1' - if ! kldstat -v | grep osf1_ecoff > /dev/null; then - kldload osf1 > /dev/null 2>&1 - fi - fi -} - # SCO binary emulation # ibcs2_compat() @@ -61,10 +40,6 @@ archdep_start() i386) ibcs2_compat ;; - alpha) - osf1_compat - unaligned_warnings - ;; esac echo '.' } diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 59b5637..557322c 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -2797,13 +2797,6 @@ Set to .Dq Li YES to enable Linux/ELF binary emulation at system initial boot time. -.It Va osf1_enable -.Pq Vt bool -Set to -.Dq Li YES -to enable OSF/1 (Digital UNIX) binary emulation at system -initial boot time. -(alpha) .It Va svr4_enable .Pq Vt bool If set to @@ -3221,12 +3214,6 @@ to be used within a jail. If set to .Dq Li YES , allow applications within a jail to use System V IPC. -.It Va unaligned_print -.Pq Vt bool -If set to -.Dq Li NO , -unaligned access warnings will not be printed. -(alpha) .\" ----- ISDN settings --------------------------------- .It Va isdn_enable .Pq Vt bool -- cgit v1.1