--- a/installationservices/swi/source/certstoretobin/Util.pm	Thu Aug 19 10:02:49 2010 +0300
+++ b/installationservices/swi/source/certstoretobin/Util.pm	Tue Aug 31 15:21:33 2010 +0300
@@ -251,6 +251,8 @@
     my $self = shift;
     die "self not defined\n" if (not defined($self));
 
+	my $sbsflag = index("@_", "sbs");
+	
     $self->info("Invoking: @_\n");
 
     # Redirect stderr into stdout.
@@ -266,9 +268,7 @@
 
     my @warnstrings = ();
 
-    my $BuildSystemVersion = $ENV{'SBS_VERSION'};
- 
- 	if ($BuildSystemVersion == 2) 
+  	if($sbsflag != -1)
  	{
  		foreach (@out)
  		{