From 63e9de9a0bcabb2ed89d5dfdc747981d1ebb8701 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Sat, 23 Nov 2002 18:29:21 +0000 Subject: [PATCH] no more altqd use --- src/etc/changelist | 3 +-- src/etc/rc | 8 +------- src/etc/rc.conf | 3 +-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/etc/changelist b/src/etc/changelist index 61c6f61e..2c1f1c4f 100644 --- a/src/etc/changelist +++ b/src/etc/changelist @@ -1,4 +1,4 @@ -# $OpenBSD: changelist,v 1.26 2002/09/22 23:37:13 millert Exp $ +# $OpenBSD: changelist,v 1.27 2002/11/23 18:29:21 deraadt Exp $ # # List of files which the security script backs up and checks # for modifications. @@ -8,7 +8,6 @@ # /etc/Distfile -/etc/altq.conf /etc/boot.conf /etc/bootparams /etc/bootptab diff --git a/src/etc/rc b/src/etc/rc index c66c4441..8c2357c0 100644 --- a/src/etc/rc +++ b/src/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.208 2002/11/14 09:02:28 camield Exp $ +# $OpenBSD: rc,v 1.209 2002/11/23 18:29:21 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. @@ -432,12 +432,6 @@ if [ "X${mrouted_flags}" != X"NO" ]; then echo -n ' mrouted'; mrouted $mrouted_flags fi -# $altqd_flags is imported from /etc/rc.conf; -# If $altqd_flags == NO, then altqd isn't run. -if [ "X${altqd_flags}" != X"NO" ]; then - echo -n ' altqd'; altqd $altqd_flags -fi - # $dhcpd_flags is imported from /etc/rc.conf # If $dhcpd_flags == NO or /etc/dhcpd.conf doesn't exist, then dhcpd isn't run. if [ "X${dhcpd_flags}" != X"NO" -a -f /etc/dhcpd.conf ]; then diff --git a/src/etc/rc.conf b/src/etc/rc.conf index 26aca5f1..b86b6145 100644 --- a/src/etc/rc.conf +++ b/src/etc/rc.conf @@ -1,10 +1,9 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.80 2002/10/04 23:16:41 deraadt Exp $ +# $OpenBSD: rc.conf,v 1.81 2002/11/23 18:29:21 deraadt Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for normal use: "-q" -altqd_flags=NO # for normal use: "" mrouted_flags=NO # for normal use: "", if activated # be sure to enable multicast_router below. rarpd_flags=NO # for normal use: "-a"