From 7faa7e815a0f51e4f1d1eca513014bc2742afb09 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Thu, 17 Dec 2015 15:19:58 +0000
Subject: [PATCH] scstadmin: Merge trunk r6752, part 2

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.1.x@6754 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 .../scst-1.0.0/t/after-restore.conf           | 60 -----------------
 .../scst-1.0.0/t/to-be-restored.conf          | 67 -------------------
 2 files changed, 127 deletions(-)
 delete mode 100644 scstadmin/scstadmin.sysfs/scst-1.0.0/t/after-restore.conf
 delete mode 100644 scstadmin/scstadmin.sysfs/scst-1.0.0/t/to-be-restored.conf

diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/after-restore.conf b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/after-restore.conf
deleted file mode 100644
index 8f5291be5..000000000
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/after-restore.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# Automatically generated by SCST Configurator v...
-
-
-HANDLER vdisk_fileio {
-	DEVICE disk01 {
-		filename /proc/cpuinfo
-	}
-}
-
-TARGET_DRIVER scst_local {
-	TARGET local1 {
-		session_name local1_session
-
-		LUN 0 disk01
-		LUN 1 disk01
-
-		GROUP group_without_luns_with_attrs {
-
-			addr_method FLAT
-		}
-
-		GROUP initiator_group {
-			LUN 0 disk01
-			LUN 1 disk01 {
-				read_only 1
-			}
-			LUN 2 disk01
-
-			INITIATOR ini1
-
-			INITIATOR ini2
-
-			INITIATOR ini3
-		}
-	}
-}
-
-DEVICE_GROUP dg01 {
-	DEVICE disk01
-
-	TARGET_GROUP tg01a {
-		group_id 1
-		preferred 1
-		state active
-
-		TARGET tgt_a {
-			rel_tgt_id 2
-		}
-	}
-
-	TARGET_GROUP tg01b {
-		group_id 2
-		state active
-
-		TARGET tgt_b {
-			rel_tgt_id 3
-		}
-	}
-}
-
diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/to-be-restored.conf b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/to-be-restored.conf
deleted file mode 100644
index 9e56bc187..000000000
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/to-be-restored.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# Automatically generated by SCST Configurator v3.0.0-pre2.
-
-
-HANDLER vdisk_fileio {
-	DEVICE disk01 {
-		filename /proc/cpuinfo
-	}
-}
-
-TARGET_DRIVER ib_srpt {
-	TARGET no_such_target {
-		enabled 1
-	}
-}
-
-TARGET_DRIVER scst_local {
-	TARGET local1 {
-		session_name local1_session
-
-		LUN 0 disk01
-		LUN 1 disk01
-
-		GROUP initiator_group {
-			LUN 0 disk01
-			LUN 1 disk01 {
-				read_only 1
-			}
-			LUN 2 disk01
-
-			INITIATOR ini1
-
-			INITIATOR ini2
-
-			INITIATOR ini3
-		}
-
-		GROUP group_without_luns_with_attrs {
-
-			addr_method FLAT
-		}
-	}
-}
-
-DEVICE_GROUP dg01 {
-	DEVICE disk01
-
-	TARGET_GROUP tg01a {
-		group_id 1
-		preferred 1
-		state active
-
-		TARGET tgt_a {
-			rel_tgt_id 2
-		}
-	}
-
-	TARGET_GROUP tg01b {
-		group_id 2
-		preferred 0
-		state active
-
-		TARGET tgt_b {
-			rel_tgt_id 3
-		}
-	}
-}
-