From 9c037ae5776cc2a7b54412a94600837262ab7b11 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Wed, 25 Mar 2015 19:43:30 +0000
Subject: [PATCH] scstadmin: Fix saving groups without LUNs

Reported-by: Aayush Kasurde <aayush.kasurde@gmail.com>


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6150 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 .../scst-0.9.10/t/after-restore.conf                |  5 +++++
 .../scst-0.9.10/t/to-be-restored.conf               |  5 +++++
 scstadmin/scstadmin.sysfs/scstadmin                 | 13 +++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/after-restore.conf b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/after-restore.conf
index da8c75c37..f0c5264f2 100644
--- a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/after-restore.conf
+++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/after-restore.conf
@@ -27,6 +27,11 @@ TARGET_DRIVER scst_local {
 
 			INITIATOR ini3
 		}
+
+		GROUP group_without_luns_with_attrs {
+
+			addr_method FLAT
+		}
 	}
 }
 
diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/to-be-restored.conf b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/to-be-restored.conf
index b4988b721..9e56bc187 100644
--- a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/to-be-restored.conf
+++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/to-be-restored.conf
@@ -33,6 +33,11 @@ TARGET_DRIVER scst_local {
 
 			INITIATOR ini3
 		}
+
+		GROUP group_without_luns_with_attrs {
+
+			addr_method FLAT
+		}
 	}
 }
 
diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index e2e921824..a0f7ebb44 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -1566,12 +1566,6 @@ sub writeConfiguration {
 					}
 				}
 
-				if ($lun_buff || $init_buff) {
-					$group_buff .= " {\n";
-					$group_buff .= $lun_buff;
-					$group_buff .= $init_buff;
-				}
-
 				my ($grp_attributes, $errorString) = $SCST->groupAttributes($driver, $target, $group);
 				my $g_attribute_buff
 				    = serializeKeyAttr("\t\t\t",
@@ -1581,6 +1575,13 @@ sub writeConfiguration {
 						      $grp_attributes)
 				    if ($nonkey);
 
+				if ($lun_buff || $init_buff ||
+				    $g_attribute_buff || $g_attribute_buff_nk) {
+					$group_buff .= " {\n";
+					$group_buff .= $lun_buff;
+					$group_buff .= $init_buff;
+				}
+
 				if ($g_attribute_buff_nk) {
 					$g_attribute_buff .= "\n" if ($g_attribute_buff);
 					$g_attribute_buff .= "\t\t\t# Non-key attributes\n";