Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 42394)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 42395)
@@ -506,4 +506,5 @@
                      "                            [--username <username>]\n"
                      "                            [--password <password>]\n"
+                     "                            [--initiator <initiator>]\n"
                      "                            [--intnet]\n"
                      "\n");
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 42394)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 42395)
@@ -68,4 +68,5 @@
     { "--username",         'U', RTGETOPT_REQ_STRING },
     { "--password",         'W', RTGETOPT_REQ_STRING },
+    { "--initiator",        'N', RTGETOPT_REQ_STRING },
     { "--intnet",           'I', RTGETOPT_REQ_NOTHING },
 };
@@ -100,4 +101,5 @@
     Bstr bstrUsername;
     Bstr bstrPassword;
+    Bstr bstrInitiator;
     bool fIntNet = false;
 
@@ -268,4 +270,8 @@
             case 'W':   // --password
                 bstrPassword = ValueUnion.psz;
+                break;
+
+            case 'N':   // --initiator
+                bstrInitiator = ValueUnion.psz;
                 break;
 
@@ -597,11 +603,9 @@
                     bstrPassword.detachTo(values.appendedRaw());
                 }
-
-                /// @todo add --initiator option - until that happens rely on the
-                // defaults of the iSCSI initiator code. Setting it to a constant
-                // value does more harm than good, as the initiator name is supposed
-                // to identify a particular initiator uniquely.
-        //        Bstr("InitiatorName").detachTo(names.appendedRaw());
-        //        Bstr("iqn.2008-04.com.sun.virtualbox.initiator").detachTo(values.appendedRaw());
+                if (!bstrPassword.isEmpty())
+                {
+                    Bstr("InitiatorName").detachTo(names.appendedRaw());
+                    bstrInitiator.detachTo(values.appendedRaw());
+                }
 
                 /// @todo add --targetName and --targetPassword options