1 files changed, 17 insertions, 1 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
index e9398eaf82..390d747b7c 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -156,6 +156,10 @@ public class StartArgs
     /** --add-to-start=[module,[module]] */
     private List<String> addToStartIni = new ArrayList<>();
 
+    /** Tri-state True if modules should be added to StartdFirst, false if StartIni first, else null */
+    private Boolean addToStartdFirst;
+    
+    
     // module inspection commands
     /** --write-module-graph=[filename] */
     private String moduleGraphFilename;
@@ -181,6 +185,7 @@ public class StartArgs
     private boolean exec = false;
     private String exec_properties;
     private boolean approveAllLicenses = false;
+   
 
     public StartArgs()
     {
@@ -780,6 +785,13 @@ public class StartArgs
         return version;
     }
 
+    public boolean isAddToStartdFirst()
+    {
+        if (addToStartdFirst==null)
+            throw new IllegalStateException();
+        return addToStartdFirst.booleanValue();
+    }
+    
     public void parse(ConfigSources sources)
     {
         ListIterator<ConfigSource> iter = sources.reverseListIterator();
@@ -808,7 +820,7 @@ public class StartArgs
      * @param replaceProps
      *            true if properties in this parse replace previous ones, false to not replace.
      */
-    private void parse(final String rawarg, String source, boolean replaceProps)
+    public void parse(final String rawarg, String source, boolean replaceProps)
     {
         if (rawarg == null)
         {
@@ -954,6 +966,8 @@ public class StartArgs
             run = false;
             download = true;
             licenseCheckRequired = true;
+            if (addToStartdFirst==null)
+                addToStartdFirst=Boolean.TRUE;
             return;
         }
 
@@ -965,6 +979,8 @@ public class StartArgs
             run = false;
             download = true;
             licenseCheckRequired = true;
+            if (addToStartdFirst==null)
+                addToStartdFirst=Boolean.FALSE;
             return;
         }