From fa495e2139a5c5dad9f1f23c4bd8283c931c24a9 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Tue, 14 Feb 2017 03:27:53 +0000 Subject: [PATCH] Merged revisions 7091-7092 via svnmerge from svn+ssh://svn.code.sf.net/p/scst/svn/trunk ........ r7091 | vlnb | 2017-01-23 16:29:41 -0800 (Mon, 23 Jan 2017) | 5 lines Add scstadmin in the dist archive Reported by David Chen ........ r7092 | bvassche | 2017-02-04 22:52:06 -0800 (Sat, 04 Feb 2017) | 6 lines scstadmin: Revert r7014 The immediateExit() call introduced in r7014 prevents to assign multiple values to attributes that support multiple values, e.g. 'allowed_portal'. Hence revert r7014. ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.2.x@7093 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- Makefile | 2 +- scstadmin/scstadmin.sysfs/scstadmin | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ff8d4913f..174180907 100644 --- a/Makefile +++ b/Makefile @@ -419,7 +419,7 @@ scst-dist-gzip: else \ scripts/list-source-files; \ fi | \ - grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|_git)/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/'|\ + grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|_git)/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/|^scstadmin/'|\ tar -T- -cf- | \ tar -C $${name}-$(VERSION) -xf-; \ } && \ diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index 162c6c06f..94355b670 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -5762,8 +5762,6 @@ sub configToAttr { if (!scalar keys %{$$config{$attr}}) { $attributes{$attr} = ''; } elsif ((keys %{$$config{$attr}}) > 1) { - immediateExit("Invalid configuration encountered. ". - "Attribute '$attr' has multiple values."); foreach my $value (keys %{$$config{$attr}}) { push @{$attributes{$attr}}, $value; }