From c2416ee17a095c0488a52347e12dce9b23e81037 Mon Sep 17 00:00:00 2001 From: mbalmer <> Date: Mon, 9 Jun 2008 22:21:49 +0000 Subject: [PATCH] Replace nmeattach (which will be removed) with ldattach. --- src/etc/rc | 6 +++--- src/etc/rc.conf | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/etc/rc b/src/etc/rc index fdd48ef1..828ac82f 100644 --- a/src/etc/rc +++ b/src/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.315 2008/06/08 03:03:37 jdixon Exp $ +# $OpenBSD: rc,v 1.316 2008/06/09 22:21:49 mbalmer Exp $ # System startup script run by init on autoboot # or after single-user. @@ -415,8 +415,8 @@ if [ X"${timed_flags}" != X"NO" ]; then echo -n ' timed'; timed $timed_flags fi -if [ X"${nmeaattach_flags}" != X"NO" -a -n "${nmeaattach_flags}" ]; then - echo -n ' nmeaattach'; nmeaattach ${nmeaattach_flags} +if [ X"${ldattach_flags}" != X"NO" -a -n "${ldattach_flags}" ]; then + echo -n ' ldattach'; ldattach ${ldattach_flags} fi if [ X"${ntpd_flags}" != X"NO" ]; then diff --git a/src/etc/rc.conf b/src/etc/rc.conf index 945a1cb3..6512af4f 100644 --- a/src/etc/rc.conf +++ b/src/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.129 2008/05/07 11:58:14 claudio Exp $ +# $OpenBSD: rc.conf,v 1.130 2008/06/09 22:21:49 mbalmer Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags ripd_flags=NO # for normal use: "" @@ -17,7 +17,7 @@ sshd_flags="" # for normal use: "" named_flags=NO # for normal use: "" rdate_flags=NO # for normal use: [RFC868-host] or [-n RFC2030-host] timed_flags=NO # for normal use: "" -nmeaattach_flags=NO # for normal use: "[options] cua-device" +ldattach_flags=NO # for normal use: "[options] linedisc cua-device" ntpd_flags=NO # for normal use: "" isakmpd_flags=NO # for normal use: "" sasyncd_flags=NO # for normal use: ""