summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2008-06-09 22:21:50 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2008-06-09 22:21:50 +0000
commitd4c7d15df0831e80a46ebcfb891db89819a7cd12 (patch)
tree45e8296b179b5c39053e8442f40196ba8bc75413
parente692f0a42402f3aaaf305e3cfb9f5f052925ff60 (diff)
Replace nmeattach (which will be removed) with ldattach.
-rw-r--r--etc/rc6
-rw-r--r--etc/rc.conf4
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/rc b/etc/rc
index fdd48ef1d25..828ac82fd00 100644
--- a/etc/rc
+++ b/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/etc/rc.conf b/etc/rc.conf
index 945a1cb3add..6512af4ffb8 100644
--- a/etc/rc.conf
+++ b/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: ""