From 7bfbb41963bf65e925d7ce2aee3bc2e1c39ab6aa Mon Sep 17 00:00:00 2001
From: Mark Buechler <mark.buechler@gmail.com>
Date: Thu, 22 Jul 2010 16:29:27 +0000
Subject: [PATCH] - When reading deprecated config files, don't configure empty
 groups. - Minor formatting fix in writeConfiguration().

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

diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index 28e7ebdc3..91f5e9405 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -1056,6 +1056,9 @@ sub writeConfiguration {
 					$t_lun_buff .= "\n";
 				}
 			}
+
+			$t_lun_buff .= "\n" if ($t_lun_buff);
+
 			my $groups = $CURRENT{'assign'}->{$driver}->{$target}->{'GROUP'};
 
 			my $group_buff;
@@ -2981,7 +2984,9 @@ sub readOldConfig {
 			my $targets = $SCST->targets($driver);
 
 			foreach my $target (@{$targets}) {
-				%{$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'enabled'}->{'0'}} = ();
+				my $enable = ($driver =~ /^qla/) ? 0 : 1;
+
+				%{$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'enabled'}->{$enable}} = ();
 
 				addAllGroupsToTarget(\%config, \%new, $driver, $target);
 			}
@@ -3003,7 +3008,9 @@ sub readOldConfig {
 					my $targets = $SCST->targets($driver);
 
 					foreach my $target (@{$targets}) {
-						$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'enabled'}->{'0'} = ()
+						my $enable = ($driver =~ /^qla/) ? 0 : 1;
+
+						$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'enabled'}->{$enable} = ()
 						  if (!defined($new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}));
 
 						$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'LUN'}->{$lun}->{$device} = {};
@@ -3021,8 +3028,9 @@ sub readOldConfig {
 					if ($target eq $group) {
 						foreach my $device (@{$config{'ASSIGNMENT'}->{$group}->{'DEVICE'}}) {
 							my($device, $lun) = split(/\,/, $device);
+							my $enable = ($driver =~ /^qla/) ? 0 : 1;
 
-							$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'enabled'}->{'0'} = ()
+							$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'enabled'}->{$enable} = ()
 							  if (!defined($new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}));
 
 							$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'LUN'}->{$lun}->{$device} = {};
@@ -3050,8 +3058,9 @@ sub addAllGroupsToTarget {
 	my $target = shift;
 
 	foreach my $group (keys %{$$config{'GROUP'}}) {
-		%{$$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'GROUP'}->{$group}} = ();
 		if (defined($$config{'GROUP'}->{$group}->{'USER'})) {
+			%{$$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'GROUP'}->{$group}} = ();
+
 			foreach my $user (@{$$config{'GROUP'}->{$group}->{'USER'}}) {
 				%{$$new{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'GROUP'}->{$group}->{'INITIATOR'}->{$user}} = ();
 			}