mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-18 21:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix resetting a create/assignment attribute to default by

Browse Source 
removing it from the config file.
- Fix closing pass-through devices on clearConfig().



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1992 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2010-08-25 18:43:49 +00:00
parent c02b6f3a83
commit 47fb2919c7
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scstadmin/scstadmin.sysfs/scstadmin
+14 -5
View File
@@ -1877,8 +1877,19 @@ sub compareToKeyAttribute {
my $second = shift;
foreach my $attr (keys %{$first}) {
next if (!defined($$second{$attr}->{'keys'}->{'0'}->{'value'}) && ($$first{$attr} == 0));
return TRUE if ($$first{$attr} ne $$second{$attr}->{'keys'}->{'0'}->{'value'});
if (defined($$second{$attr}->{'keys'})) {
next if (!defined($$second{$attr}->{'keys'}->{'0'}->{'value'}) && ($$first{$attr} == 0));
return TRUE if ($$first{$attr} ne $$second{$attr}->{'keys'}->{'0'}->{'value'});
} else {
next if (!defined($$second{$attr}->{'value'}) && ($$first{$attr} == 0));
return TRUE if ($$first{$attr} ne $$second{$attr}->{'value'});
}
}
foreach my $attr (keys %{$second}) {
if (defined($$second{$attr}->{'keys'}) && !defined($$first{$attr})) {
return TRUE;
}
}
return FALSE;
@@ -1913,9 +1924,7 @@ sub clearConfiguration {
foreach my $handler (sort keys %{$handlers}) {
foreach my $device (@{$$handlers{$handler}}) {
my $attributes = $SCST->deviceAttributes($device);
if (!defined($$attributes{'scsi_device'})) {
closeDevice($handler, $device, $force);
}
closeDevice($handler, $device, $force);
}
}