Merge "Project import generated by Copybara." into 11.0.9
diff --git a/scst/scstadmin/scstadmin.sysfs/scstadmin b/scst/scstadmin/scstadmin.sysfs/scstadmin
index 7ec0ff4..15aeeef 100755
--- a/scst/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scst/scstadmin/scstadmin.sysfs/scstadmin
@@ -6232,8 +6232,12 @@
my $target = shift;
my $group = shift;
+ # Don't try to add it if we just established it already exists
+ return FALSE if exists $CURRENT{assign}->{$driver}->{$target}->{GROUP}->{$group};
+
print "\t-> Adding new group '$group' to driver/target '$driver/$target': ";
+
my $rc = $SCST->addGroup($driver, $target, $group);
print "done.\n";
@@ -6369,8 +6373,8 @@
my $attributes = shift;
my $group = shift;
- # Do not complain about existing copy manager LUNs.
- if ($driver eq 'copy_manager' &&
+ # Do not complain about existing LUNs.
+ if (
$SCST->lunExists($driver, $target, $lun, $group)) {
return FALSE;
}
