From 4639378b96541fe61d6a45cb69ed3522c8f31874 Mon Sep 17 00:00:00 2001
From: trasz <trasz@FreeBSD.org>
Date: Thu, 22 Aug 2013 14:02:34 +0000
Subject: Move the old iSCSI initiator source to a more appropriate place
 (sys/dev/iscsi_initiator/ instead of sys/dev/iscsi/initiator/), to make room
 for the new one.  This is also more logical location (kernel module being
 named iscsi_initiator.ko, for example).  There is no ongoing work on this I
 know of, so it shouldn't make life harder for anyone.

There are no functional changes, apart from "svn mv" and adjusting paths.
---
 sbin/iscontrol/auth_subr.c | 2 +-
 sbin/iscontrol/config.c    | 2 +-
 sbin/iscontrol/fsm.c       | 2 +-
 sbin/iscontrol/iscontrol.c | 2 +-
 sbin/iscontrol/login.c     | 2 +-
 sbin/iscontrol/misc.c      | 2 +-
 sbin/iscontrol/pdu.c       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sbin/iscontrol')

diff --git a/sbin/iscontrol/auth_subr.c b/sbin/iscontrol/auth_subr.c
index 9ced1d7..5f82929 100644
--- a/sbin/iscontrol/auth_subr.c
+++ b/sbin/iscontrol/auth_subr.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <md5.h>
 #include <sha.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 static int
diff --git a/sbin/iscontrol/config.c b/sbin/iscontrol/config.c
index 6307f66..e8fd309 100644
--- a/sbin/iscontrol/config.c
+++ b/sbin/iscontrol/config.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <ctype.h>
 #include <camlib.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 /*
diff --git a/sbin/iscontrol/fsm.c b/sbin/iscontrol/fsm.c
index 794fb8b..a4660bb 100644
--- a/sbin/iscontrol/fsm.c
+++ b/sbin/iscontrol/fsm.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <stdarg.h>
 #include <camlib.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 typedef enum {
diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c
index c6ce21c..2e8f2ea 100644
--- a/sbin/iscontrol/iscontrol.c
+++ b/sbin/iscontrol/iscontrol.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <camlib.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 static char version[] = "2.3.1"; // keep in sync with iscsi_initiator
diff --git a/sbin/iscontrol/login.c b/sbin/iscontrol/login.c
index 76937a8..92bbc64b 100644
--- a/sbin/iscontrol/login.c
+++ b/sbin/iscontrol/login.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 static char *status_class1[] = {
diff --git a/sbin/iscontrol/misc.c b/sbin/iscontrol/misc.c
index 1f9dd12..b6fe6df 100644
--- a/sbin/iscontrol/misc.c
+++ b/sbin/iscontrol/misc.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <string.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 static inline char
diff --git a/sbin/iscontrol/pdu.c b/sbin/iscontrol/pdu.c
index c4d3a2a..7ce90ea 100644
--- a/sbin/iscontrol/pdu.c
+++ b/sbin/iscontrol/pdu.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <stdarg.h>
 #include <camlib.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsi.h>
 #include "iscontrol.h"
 
 static void	pukeText(char *it, pdu_t *pp);
-- 
cgit v1.1