summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2015-01-14 11:29:16 +0000
committertrasz <trasz@FreeBSD.org>2015-01-14 11:29:16 +0000
commit45a21be73d6a27093c1e27c6ba4ac92d1d32f1eb (patch)
treee2e5dcff7b145b8d5a22062de4c2ea7fbbdb0877
parent94c8d66297f752832e45a81563ebf3cf6ca29b4b (diff)
downloadFreeBSD-src-45a21be73d6a27093c1e27c6ba4ac92d1d32f1eb.zip
FreeBSD-src-45a21be73d6a27093c1e27c6ba4ac92d1d32f1eb.tar.gz
MFC r275510:
Move iscsi.conf.5 from sbin/iscontrol/ to usr.bin/iscsictl/, as the former is obsolete. Sponsored by: The FreeBSD Foundation
-rw-r--r--sbin/iscontrol/Makefile2
-rw-r--r--usr.bin/iscsictl/Makefile2
-rw-r--r--usr.bin/iscsictl/iscsi.conf.5 (renamed from sbin/iscontrol/iscsi.conf.5)0
3 files changed, 2 insertions, 2 deletions
diff --git a/sbin/iscontrol/Makefile b/sbin/iscontrol/Makefile
index 9bdc29b..65091a5 100644
--- a/sbin/iscontrol/Makefile
+++ b/sbin/iscontrol/Makefile
@@ -9,6 +9,6 @@ S= ${.CURDIR}/../../sys
WARNS?= 3
CFLAGS+= -I$S
-MAN= iscsi.conf.5 iscontrol.8
+MAN= iscontrol.8
.include <bsd.prog.mk>
diff --git a/usr.bin/iscsictl/Makefile b/usr.bin/iscsictl/Makefile
index 9351ed7..da3790e 100644
--- a/usr.bin/iscsictl/Makefile
+++ b/usr.bin/iscsictl/Makefile
@@ -4,7 +4,7 @@ PROG= iscsictl
SRCS= iscsictl.c periphs.c parse.y token.l y.tab.h
CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi
-MAN= iscsictl.8
+MAN= iscsi.conf.5 iscsictl.8
DPADD= ${LIBCAM} ${LIBUTIL}
LDADD= -lcam -lutil
diff --git a/sbin/iscontrol/iscsi.conf.5 b/usr.bin/iscsictl/iscsi.conf.5
index 2e7a68d..2e7a68d 100644
--- a/sbin/iscontrol/iscsi.conf.5
+++ b/usr.bin/iscsictl/iscsi.conf.5
OpenPOWER on IntegriCloud