summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2018-07-12 08:20:37 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2018-07-12 08:20:37 +0000
commit5c35370ffbce3c5c7365d9a816bfe90f2fa8027d (patch)
tree04a8aa59874c86988ffab9c6adfbb778a143d198 /etc
parent33cf8f5ac94de24c516f09478c76f4d1adf9d7cd (diff)
rc(8) infrastructure for rad
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile4
-rw-r--r--etc/rc4
-rw-r--r--etc/rc.conf3
-rw-r--r--etc/rc.d/rad9
4 files changed, 15 insertions, 5 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 45707622adc..543e50675c5 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.462 2018/04/29 11:17:02 schwarze Exp $
+# $OpenBSD: Makefile,v 1.463 2018/07/12 08:20:36 florian Exp $
.include <bsd.own.mk>
@@ -61,7 +61,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dhcrelay6 dvmrpd \
eigrpd ftpd ftpproxy ftpproxy6 hostapd hotplugd httpd identd ifstated \
iked inetd isakmpd iscsid ldapd ldattach ldomd ldpd lockd \
lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
- pflogd portmap radiusd rarpd rbootd rebound relayd ripd route6d \
+ pflogd portmap rad radiusd rarpd rbootd rebound relayd ripd route6d \
rtadvd sasyncd sensorsd slowcgi slaacd smtpd sndiod snmpd spamd \
spamlogd sshd statd switchd syslogd tftpd tftpproxy unbound \
vmd watchdogd wsmoused xenodm ypbind ypldap ypserv
diff --git a/etc/rc b/etc/rc
index 38a9ba57604..33a33495f08 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.527 2018/07/11 21:49:37 sthen Exp $
+# $OpenBSD: rc,v 1.528 2018/07/12 08:20:36 florian Exp $
# System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the
@@ -582,7 +582,7 @@ run_upgrade_script sysmerge
echo -n 'starting network daemons:'
start_daemon ldomd sshd switchd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd route6d rtadvd
-start_daemon hostapd lpd smtpd slowcgi httpd ftpd
+start_daemon rad hostapd lpd smtpd slowcgi httpd ftpd
start_daemon ftpproxy ftpproxy6 tftpd tftpproxy identd inetd rarpd bootparamd
start_daemon rbootd mopd vmd spamd spamlogd sndiod
echo '.'
diff --git a/etc/rc.conf b/etc/rc.conf
index 05146d58a4e..de74998df5c 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: rc.conf,v 1.216 2017/05/30 12:04:26 tb Exp $
+# $OpenBSD: rc.conf,v 1.217 2018/07/12 08:20:36 florian Exp $
# DO NOT EDIT THIS FILE!!
#
@@ -46,6 +46,7 @@ ntpd_flags=
ospfd_flags=NO
ospf6d_flags=NO
pflogd_flags= # add more flags, e.g. "-s 256"
+rad_flags=NO
radiusd_flags=NO
rarpd_flags=NO
rbootd_flags=NO
diff --git a/etc/rc.d/rad b/etc/rc.d/rad
new file mode 100644
index 00000000000..aa3fa1db2fd
--- /dev/null
+++ b/etc/rc.d/rad
@@ -0,0 +1,9 @@
+#!/bin/ksh
+#
+# $OpenBSD: rad,v 1.1 2018/07/12 08:20:36 florian Exp $
+
+daemon="/usr/sbin/rad"
+
+. /etc/rc.d/rc.subr
+
+rc_cmd $1