From 96aaba2829efd9c619c3ae7f9ca207a91aad0386 Mon Sep 17 00:00:00 2001
From: Mark Buechler <mark.buechler@gmail.com>
Date: Wed, 28 Jul 2010 14:06:57 +0000
Subject: [PATCH] - Create targets from old Default_ groups for all drivers  
 capable of dynamic target creation. - While converting an old config file,
 set 'enabled' to 1 for   all non-qla drivers which have the 'enabled'
 attribute so   their targets can become enabled as well.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1884 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/scstadmin.sysfs/scstadmin | 37 +++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index 0fa36bd4f..32e846f5d 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -2993,13 +2993,12 @@ sub readOldConfig {
 		}
 	}
 
-	# Now handle default groups
+	my $drivers = $SCST->drivers();
 
+	# Now handle default groups
 	foreach my $group (keys %{$config{'ASSIGNMENT'}}) {
 		next if ($group !~ /^Default/);
 
-		my $drivers = $SCST->drivers();
-
 		if ($group eq 'Default') { # Add to all targets
 			foreach my $device (@{$config{'ASSIGNMENT'}->{$group}->{'DEVICE'}}) {
 				my($device, $lun) = split(/\,/, $device);
@@ -3018,14 +3017,15 @@ sub readOldConfig {
 				}
 			}
 		} else {
-			$group =~ s/^Default\_//;
+			my $group_t = $group;
+			$group_t =~ s/^Default\_//;
 			my $found_t = FALSE;
 			# Find the associated target
 			foreach my $driver (@{$drivers}) {
 				my $targets = $SCST->targets($driver);
 
 				foreach my $target (@{$targets}) {
-					if ($target eq $group) {
+					if ($target eq $group_t) {
 						foreach my $device (@{$config{'ASSIGNMENT'}->{$group}->{'DEVICE'}}) {
 							my($device, $lun) = split(/\,/, $device);
 							my $enable = ($driver =~ /^qla/) ? 0 : 1;
@@ -3042,12 +3042,35 @@ sub readOldConfig {
 			}
 
 			if (!$found_t) {
-				print "WARNING: Unable to find target $group. Please ".
-				  "configure these assignments manually.\n\n";
+				print "WARNING: Unable to find target $group. I will add this target to ".
+				  "all drivers capable of creating targets.\n";
+
+				foreach my $driver (@{$drivers}) {
+					if ($SCST->driverIsVirtualCapable($driver)) {
+						foreach my $device (@{$config{'ASSIGNMENT'}->{$group}->{'DEVICE'}}) {
+							my($device, $lun) = split(/\,/, $device);
+							my $enable = ($driver =~ /^qla/) ? 0 : 1;
+
+							$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$group_t}->{'enabled'}->{$enable} = ();
+							$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$group_t}->{'LUN'}->{$lun}->{$device} = {};
+						}
+					}
+				}
 			}
 		}
 	}
 
+	# Fix drivers 'enabled' attributes
+	foreach my $driver (@{$drivers}) {
+		next if ($driver =~ /^qla/);
+
+		my $attributes = $SCST->driverAttributes($driver);
+
+		if (defined($$attributes{'enabled'})) {
+			$new{'TARGET_DRIVER'}->{$driver}->{'enabled'}->{'1'} = ();
+		}
+	}
+
 	return \%new;
 }