diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-11 07:08:32 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-11 07:08:32 +0000 |
| commit | bf4551aa326eb2d4436b7fc27395c12c5fd7c28b (patch) | |
| tree | 014c298a7b5bf94c53d2954853d7eda012b62a35 /etc | |
| parent | b7391dae4ae82148a179e853c782b7da6f441b70 (diff) | |
| download | FreeBSD-src-bf4551aa326eb2d4436b7fc27395c12c5fd7c28b.zip FreeBSD-src-bf4551aa326eb2d4436b7fc27395c12c5fd7c28b.tar.gz | |
MFC r277675,r277726,r278070:
r277675:
Add MK_ISCSI knob for building the iscsi initiator, iscsi daemon, kernel
modules, etc
Sponsored by: EMC / Isilon Storage Division
r277726:
Build sbin/iscontrol again if MK_ISCSI != no
Pointyhat to: me
r278070:
Remove duplicate MK_ISCSI block and sort the conditional blocks so this error
won't crop up again in the future
Reported by: gjb
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.d/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index d464a31..0db93bc 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -63,8 +63,6 @@ FILES= DAEMON \ ipropd_slave \ ipsec \ ${_ipxrouted} \ - iscsictl \ - iscsid \ ${_kadmind} \ ${_kdc} \ keyserv \ @@ -188,6 +186,11 @@ FILES+= bsnmpd _ipxrouted= ipxrouted .endif +.if ${MK_ISCSI} != "no" +FILES+= iscsictl +FILES+= iscsid +.endif + .if ${MK_JAIL} != "no" FILES+= jail .endif |
