diff options
author | trasz <trasz@FreeBSD.org> | 2013-09-14 15:29:06 +0000 |
---|---|---|
committer | trasz <trasz@FreeBSD.org> | 2013-09-14 15:29:06 +0000 |
commit | a992abf0413f4cc428d4368e1d82d65f5b3d6397 (patch) | |
tree | d04af1389a0e20c7613b9dccaf4f3176084e40cc /etc | |
parent | 889b9d0e0bc82fd4927dd02d64c973c36fa661a3 (diff) | |
download | FreeBSD-src-a992abf0413f4cc428d4368e1d82d65f5b3d6397.zip FreeBSD-src-a992abf0413f4cc428d4368e1d82d65f5b3d6397.tar.gz |
Bring in the new iSCSI target and initiator.
Reviewed by: ken (parts)
Approved by: re (delphij)
Sponsored by: FreeBSD Foundation
Diffstat (limited to 'etc')
-rw-r--r-- | etc/defaults/rc.conf | 4 | ||||
-rw-r--r-- | etc/rc.d/Makefile | 3 | ||||
-rwxr-xr-x | etc/rc.d/ctld | 22 | ||||
-rwxr-xr-x | etc/rc.d/iscsictl | 20 | ||||
-rwxr-xr-x | etc/rc.d/iscsid | 20 |
5 files changed, 69 insertions, 0 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 47d5145..39957278 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -263,9 +263,13 @@ syslogd_flags="-s" # Flags to syslogd (if enabled). inetd_enable="NO" # Run the network daemon dispatcher (YES/NO). inetd_program="/usr/sbin/inetd" # path to inetd, if you want a different one. inetd_flags="-wW -C 60" # Optional flags to inetd +iscsid_enable="NO" # iSCSI initiator daemon. +iscsictl_enable="NO" # iSCSI initiator autostart. +iscsictl_flags="-Aa" # Optional flags to iscsictl. hastd_enable="NO" # Run the HAST daemon (YES/NO). hastd_program="/sbin/hastd" # path to hastd, if you want a different one. hastd_flags="" # Optional flags to hastd. +ctld_enable="NO" # CAM Target Layer / iSCSI target daemon. # # named. It may be possible to run named in a sandbox, man security for # details. diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 3defd97..153918d 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -30,6 +30,7 @@ FILES= DAEMON \ cleanvar \ cleartmp \ cron \ + ctld \ ddb \ defaultroute \ devd \ @@ -62,6 +63,8 @@ FILES= DAEMON \ ipnat \ ipsec \ ${_ipxrouted} \ + iscsictl \ + iscsid \ jail \ kadmind \ kerberos \ diff --git a/etc/rc.d/ctld b/etc/rc.d/ctld new file mode 100755 index 0000000..87fb816 --- /dev/null +++ b/etc/rc.d/ctld @@ -0,0 +1,22 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: ctld +# REQUIRE: FILESYSTEMS +# BEFORE: DAEMON +# KEYWORD: nojail + +. /etc/rc.subr + +name="ctld" +rcvar="ctld_enable" +pidfile="/var/run/${name}.pid" +command="/usr/sbin/${name}" +required_files="/etc/ctl.conf" +required_modules="ctl" +extra_commands="reload" + +load_rc_config $name +run_rc_command "$1" diff --git a/etc/rc.d/iscsictl b/etc/rc.d/iscsictl new file mode 100755 index 0000000..0925e0a --- /dev/null +++ b/etc/rc.d/iscsictl @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: iscsictl +# REQUIRE: NETWORK iscsid +# BEFORE: DAEMON +# KEYWORD: nojail + +. /etc/rc.subr + +name="iscsictl" +rcvar="iscsictl_enable" +command="/usr/bin/${name}" +command_args="${iscsictl_flags}" +required_modules="iscsi" + +load_rc_config $name +run_rc_command "$1" diff --git a/etc/rc.d/iscsid b/etc/rc.d/iscsid new file mode 100755 index 0000000..287631d --- /dev/null +++ b/etc/rc.d/iscsid @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: iscsid +# REQUIRE: NETWORK +# BEFORE: DAEMON +# KEYWORD: nojail + +. /etc/rc.subr + +name="iscsid" +rcvar="iscsid_enable" +pidfile="/var/run/${name}.pid" +command="/usr/sbin/${name}" +required_modules="iscsi" + +load_rc_config $name +run_rc_command "$1" |