[Scst-svn] SF.net SVN: scst:[1863] trunk/scstadmin/scstadmin.sysfs/scstadmin

[<mga...@us...>]

Revision: 1863
          http://scst.svn.sourceforge.net/scst/?rev=1863&view=rev
Author:   mgandalf
Date:     2010-07-22 16:29:27 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
- When reading deprecated config files, don't configure empty groups.
- Minor formatting fix in writeConfiguration().

Modified Paths:
--------------
    trunk/scstadmin/scstadmin.sysfs/scstadmin

Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin	2010-07-22 14:59:08 UTC (rev 1862)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin	2010-07-22 16:29:27 UTC (rev 1863)
@@ -1056,6 +1056,9 @@
 					$t_lun_buff .= "\n";
 				}
 			}
+
+			$t_lun_buff .= "\n" if ($t_lun_buff);
+
 			my $groups = $CURRENT{'assign'}->{$driver}->{$target}->{'GROUP'};
 
 			my $group_buff;
@@ -2981,8 +2984,10 @@
 			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 @@
 					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 @@
 					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 @@
 	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}} = ();
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.