From 2cab37c2c26c356eca9dc118f11e871e59dc310b Mon Sep 17 00:00:00 2001 From: Mark Buechler Date: Tue, 15 Jun 2010 17:12:16 +0000 Subject: [PATCH] - Better handling on 'enabled' attribute. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1774 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/scst-0.9.00/lib/SCST/SCST.pm | 14 ------ scstadmin/scstadmin.sysfs | 62 +++++++++++++++++++------- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/scstadmin/scst-0.9.00/lib/SCST/SCST.pm b/scstadmin/scst-0.9.00/lib/SCST/SCST.pm index 1041e0351..911b9c063 100644 --- a/scstadmin/scst-0.9.00/lib/SCST/SCST.pm +++ b/scstadmin/scst-0.9.00/lib/SCST/SCST.pm @@ -278,8 +278,6 @@ sub scstAttributes { my $is_key = <$io>; $is_key = ($is_key =~ /\[key\]/) ? TRUE : FALSE; - $is_key = TRUE if ($attribute eq 'enabled'); - my $key = 0; if ($is_key) { if ($attribute =~ /.*(\d+)$/) { @@ -1745,8 +1743,6 @@ sub deviceAttributes { my $is_key = <$io>; $is_key = ($is_key =~ /\[key\]/) ? TRUE : FALSE; - $is_key = TRUE if ($attribute eq 'enabled'); - my $key = 0; if ($is_key) { if ($attribute =~ /.*(\d+)$/) { @@ -1828,8 +1824,6 @@ sub driverAttributes { my $is_key = <$io>; $is_key = ($is_key =~ /\[key\]/) ? TRUE : FALSE; - $is_key = TRUE if ($attribute eq 'enabled'); - my $key = 0; if ($is_key) { if ($attribute =~ /.*(\d+)$/) { @@ -1964,8 +1958,6 @@ sub targetAttributes { my $is_key = <$io>; $is_key = ($is_key =~ /\[key\]/) ? TRUE : FALSE; - $is_key = TRUE if ($attribute eq 'enabled'); - my $key = 0; if ($is_key) { if ($attribute =~ /.*(\d+)$/) { @@ -2095,8 +2087,6 @@ sub groupAttributes { my $is_key = <$io>; $is_key = ($is_key =~ /\[key\]/) ? TRUE : FALSE; - $is_key = TRUE if ($attribute eq 'enabled'); - my $key = 0; if ($is_key) { if ($attribute =~ /.*(\d+)$/) { @@ -2406,8 +2396,6 @@ sub initiatorAttributes { my $is_key = <$io>; $is_key = ($is_key =~ /\[key\]/) ? TRUE : FALSE; - $is_key = TRUE if ($attribute eq 'enabled'); - my $key = 0; if ($is_key) { if ($attribute =~ /.*(\d+)$/) { @@ -2613,8 +2601,6 @@ sub handlerAttributes { my $is_key = <$io>; $is_key = ($is_key =~ /\[key\]/) ? TRUE : FALSE; - $is_key = TRUE if ($attribute eq 'enabled'); - my $key = 0; if ($is_key) { if ($attribute =~ /.*(\d+)$/) { diff --git a/scstadmin/scstadmin.sysfs b/scstadmin/scstadmin.sysfs index 42c752da4..a46ed3cea 100755 --- a/scstadmin/scstadmin.sysfs +++ b/scstadmin/scstadmin.sysfs @@ -802,10 +802,14 @@ sub writeConfiguration { $value = "\"$value\"" if ($value =~ / /); $handler_buff .= "\t$attribute $value\n" if (defined($value)); } - } elsif ($nonkey) { + } elsif (($attribute eq 'enabled') || $nonkey) { my $value = $$attributes{$attribute}->{'value'}; $value = "\"$value\"" if ($value =~ / /); - $handler_buff_nk .= "\t$attribute $value\n" if (defined($value)); + if ($attribute eq 'enabled') { + $handler_buff .= "\t$attribute $value\n" if (defined($value)); + } else { + $handler_buff_nk .= "\t$attribute $value\n" if (defined($value)); + } } } } @@ -832,11 +836,16 @@ sub writeConfiguration { $attribute_buff .= "\t\t$attribute $value\n" if (defined($value)); } - } elsif ($nonkey) { + } elsif (($attribute eq 'enabled') || $nonkey) { my $value = $$attributes{$attribute}->{'value'}; $value = "\"$value\"" if ($value =~ / /); - $attribute_buff_nk .= "\t\t$attribute $value\n" - if (defined($value)); + if ($attribute eq 'enabled') { + $attribute_buff .= "\t\t$attribute $value\n" + if (defined($value)); + } else { + $attribute_buff_nk .= "\t\t$attribute $value\n" + if (defined($value)); + } } } } @@ -917,11 +926,16 @@ sub writeConfiguration { $drv_attr_buff .= "\t$attr $value\n" if (defined($value)); } - } elsif ($nonkey) { + } elsif (($attr eq 'enabled') || $nonkey) { my $value = $$drv_attrs{$attr}->{'value'}; $value = "\"$value\"" if ($value =~ /\s/); - $drv_attr_buff_nk .= "\t$attr $value\n" - if (defined($value)); + if ($attr eq 'enabled') { + $drv_attr_buff .= "\t$attr $value\n" + if (defined($value)); + } else { + $drv_attr_buff_nk .= "\t$attr $value\n" + if (defined($value)); + } } } @@ -949,11 +963,16 @@ sub writeConfiguration { $attribute_buff .= "\t\t$attr $value\n" if (defined($value)); } - } elsif ($nonkey) { + } elsif (($attr eq 'enabled') || $nonkey) { my $value = $$tgt_attrs{$attr}->{'value'}; $value = "\"$value\"" if ($value =~ /\s/); - $attribute_buff_nk .= "\t\t$attr $value\n" - if (defined($value)); + if ($attr eq 'enabled') { + $attribute_buff .= "\t\t$attr $value\n" + if (defined($value)); + } else { + $attribute_buff_nk .= "\t\t$attr $value\n" + if (defined($value)); + } } } @@ -985,12 +1004,15 @@ sub writeConfiguration { $l_attribute_buff .= "\t\t\t$attribute $value\n" if (defined($value)); } - } elsif ($nonkey) { + } elsif (($attribute eq 'enabled') || $nonkey) { my $value = $$attributes{$attribute}->{'value'}; $value = "\"$value\"" if ($value =~ / /); if (defined($$lun_attrs{$attribute})) { $l_attribute_buff .= "\t\t\t$attribute $value\n" if (defined($value)); + } elsif ($attribute eq 'enabled') { + $l_attribute_buff .= "\t\t\t$attribute $value\n" + if (defined($value)); } else { $l_attribute_buff_nk .= "\t\t\t$attribute $value\n" if (defined($value)); @@ -1045,12 +1067,15 @@ sub writeConfiguration { $l_attribute_buff .= "\t\t\t\t$attribute $value\n" if (defined($value)); } - } elsif ($nonkey) { + } elsif (($attribute eq 'enabled') || $nonkey) { my $value = $$attributes{$attribute}->{'value'}; $value = "\"$value\"" if ($value =~ / /); if (defined($$lun_attrs{$attribute})) { $l_attribute_buff .= "\t\t\t\t$attribute $value\n" if (defined($value)); + } elsif ($attribute eq 'enabled') { + $l_attribute_buff .= "\t\t\t\t$attribute $value\n" + if (defined($value)); } else { $l_attribute_buff_nk .= "\t\t\t\t$attribute $value\n" if (defined($value)); @@ -1095,11 +1120,16 @@ sub writeConfiguration { $i_attribute_buff .= "\t\t\t\t$attribute $value\n" if (defined($value)); } - } elsif ($nonkey) { + } elsif (($attribute eq 'enabled') || $nonkey) { my $value = $$attributes{$attribute}->{'value'}; $value = "\"$value\"" if ($value =~ / /); - $i_attribute_buff_nk .= "\t\t\t\t$attribute $value\n" - if (defined($value)); + if ($attribute eq 'enabled') { + $i_attribute_buff .= "\t\t\t\t$attribute $value\n" + if (defined($value)); + } else { + $i_attribute_buff_nk .= "\t\t\t\t$attribute $value\n" + if (defined($value)); + } } } }