From be6f9f219b0623c7c53c77d14486f9cc506e29dd Mon Sep 17 00:00:00 2001
From: Mark Buechler <mark.buechler@gmail.com>
Date: Thu, 22 Jul 2010 14:51:08 +0000
Subject: [PATCH] - Rename sysfs and procfs to better names. - Specify module
 use version for procfs scstadmin.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1861 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/Makefile                                          | 4 ++--
 scstadmin/README                                            | 6 ++++--
 scstadmin/scstadmin                                         | 2 +-
 scstadmin/{procfs => scstadmin.procfs}/Makefile             | 0
 scstadmin/{procfs => scstadmin.procfs}/scst-0.8.22/MANIFEST | 0
 .../{procfs => scstadmin.procfs}/scst-0.8.22/Makefile.PL    | 0
 scstadmin/{procfs => scstadmin.procfs}/scst-0.8.22/README   | 0
 .../scst-0.8.22/lib/SCST/SCST.pm                            | 0
 scstadmin/{procfs => scstadmin.procfs}/scst_db/scst_db      | 0
 scstadmin/{procfs => scstadmin.procfs}/scst_db/scst_db.conf | 0
 .../{procfs => scstadmin.procfs}/scst_db/scst_schema.sql    | 0
 scstadmin/{procfs => scstadmin.procfs}/scstadmin            | 2 +-
 12 files changed, 8 insertions(+), 6 deletions(-)
 rename scstadmin/{procfs => scstadmin.procfs}/Makefile (100%)
 rename scstadmin/{procfs => scstadmin.procfs}/scst-0.8.22/MANIFEST (100%)
 rename scstadmin/{procfs => scstadmin.procfs}/scst-0.8.22/Makefile.PL (100%)
 rename scstadmin/{procfs => scstadmin.procfs}/scst-0.8.22/README (100%)
 rename scstadmin/{procfs => scstadmin.procfs}/scst-0.8.22/lib/SCST/SCST.pm (100%)
 rename scstadmin/{procfs => scstadmin.procfs}/scst_db/scst_db (100%)
 rename scstadmin/{procfs => scstadmin.procfs}/scst_db/scst_db.conf (100%)
 rename scstadmin/{procfs => scstadmin.procfs}/scst_db/scst_schema.sql (100%)
 rename scstadmin/{procfs => scstadmin.procfs}/scstadmin (99%)

diff --git a/scstadmin/Makefile b/scstadmin/Makefile
index d2fcf2e48..47fed5465 100644
--- a/scstadmin/Makefile
+++ b/scstadmin/Makefile
@@ -33,10 +33,10 @@ extraclean:
 
 disable_proc:
 	-rm scstadmin
-	ln -s sysfs scstadmin
+	ln -s scstadmin.sysfs scstadmin
 
 enable_proc:
 	-rm scstadmin
-	ln -s procfs scstadmin
+	ln -s scstadmin.procfs scstadmin
 
 .PHONY: all install uninstall perl-module clean distclean extraclean disable_proc enable_proc
diff --git a/scstadmin/README b/scstadmin/README
index ef48ce1d2..f440fe88a 100644
--- a/scstadmin/README
+++ b/scstadmin/README
@@ -8,8 +8,10 @@ The perl module SCST::SCST is very generic and tries to handle error checking as
 The init script was written for debian but should work on most distributions.
 
 
-	sysfs		Use this version if you've disabled procfs support in SCST.
-	procfs		This is the default version which uses the older procfs.
+	scstadmin.sysfs	
+			Use this version if you've disabled procfs support in SCST.
+	scstadmin.procfs
+			This is the default version which uses the older procfs.
 
 	scst-0.8.22	This is the SCST Perl module required by scstadmin and scst_db.
 	scst-0.9.00	This is the SCST Perl module to be used with SCST compiled
diff --git a/scstadmin/scstadmin b/scstadmin/scstadmin
index af8e7f827..cee6df140 120000
--- a/scstadmin/scstadmin
+++ b/scstadmin/scstadmin
@@ -1 +1 @@
-procfs
\ No newline at end of file
+scstadmin.procfs
\ No newline at end of file
diff --git a/scstadmin/procfs/Makefile b/scstadmin/scstadmin.procfs/Makefile
similarity index 100%
rename from scstadmin/procfs/Makefile
rename to scstadmin/scstadmin.procfs/Makefile
diff --git a/scstadmin/procfs/scst-0.8.22/MANIFEST b/scstadmin/scstadmin.procfs/scst-0.8.22/MANIFEST
similarity index 100%
rename from scstadmin/procfs/scst-0.8.22/MANIFEST
rename to scstadmin/scstadmin.procfs/scst-0.8.22/MANIFEST
diff --git a/scstadmin/procfs/scst-0.8.22/Makefile.PL b/scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL
similarity index 100%
rename from scstadmin/procfs/scst-0.8.22/Makefile.PL
rename to scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL
diff --git a/scstadmin/procfs/scst-0.8.22/README b/scstadmin/scstadmin.procfs/scst-0.8.22/README
similarity index 100%
rename from scstadmin/procfs/scst-0.8.22/README
rename to scstadmin/scstadmin.procfs/scst-0.8.22/README
diff --git a/scstadmin/procfs/scst-0.8.22/lib/SCST/SCST.pm b/scstadmin/scstadmin.procfs/scst-0.8.22/lib/SCST/SCST.pm
similarity index 100%
rename from scstadmin/procfs/scst-0.8.22/lib/SCST/SCST.pm
rename to scstadmin/scstadmin.procfs/scst-0.8.22/lib/SCST/SCST.pm
diff --git a/scstadmin/procfs/scst_db/scst_db b/scstadmin/scstadmin.procfs/scst_db/scst_db
similarity index 100%
rename from scstadmin/procfs/scst_db/scst_db
rename to scstadmin/scstadmin.procfs/scst_db/scst_db
diff --git a/scstadmin/procfs/scst_db/scst_db.conf b/scstadmin/scstadmin.procfs/scst_db/scst_db.conf
similarity index 100%
rename from scstadmin/procfs/scst_db/scst_db.conf
rename to scstadmin/scstadmin.procfs/scst_db/scst_db.conf
diff --git a/scstadmin/procfs/scst_db/scst_schema.sql b/scstadmin/scstadmin.procfs/scst_db/scst_schema.sql
similarity index 100%
rename from scstadmin/procfs/scst_db/scst_schema.sql
rename to scstadmin/scstadmin.procfs/scst_db/scst_schema.sql
diff --git a/scstadmin/procfs/scstadmin b/scstadmin/scstadmin.procfs/scstadmin
similarity index 99%
rename from scstadmin/procfs/scstadmin
rename to scstadmin/scstadmin.procfs/scstadmin
index 84bb2e1cf..9cb546a3b 100755
--- a/scstadmin/procfs/scstadmin
+++ b/scstadmin/scstadmin.procfs/scstadmin
@@ -114,7 +114,7 @@ Examples:
 EndUsage
   }
 
-use SCST::SCST;
+use SCST::SCST 0.8.22;
 use Getopt::Long;
 use IO::File;
 use IO::Dir;