mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-19 11:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Better handling on 'enabled' attribute.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1774 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2010-06-15 17:12:16 +00:00
parent 2da1657b43
commit 2cab37c2c2
2 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scstadmin/scst-0.9.00/lib/SCST/SCST.pm
View File

@@ -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+)$/) {

62
scstadmin/scstadmin.sysfs
View File

@@ -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));
}
}
}
}