modules/fxpackager/src/main/java/jdk/packager/builders/linux/LinuxAppImageBuilder.java

@@ -65,10 +65,17 @@
     protected static final String LINUX_BUNDLER_PREFIX =
             BUNDLER_PREFIX + "linux" + File.separator;
     private static final String EXECUTABLE_NAME = "JavaAppLauncher";
     private static final String LIBRARY_NAME = "libpackager.so";
 
+    private final Path root;
+    private final Path appDir;
+    private final Path runtimeRoot;
+    private final Path mdir;
+
+    private final Map<String, ? super Object> params;
+
     public static final BundlerParamInfo<File> ICON_PNG = new StandardBundlerParam<>(
             I18N.getString("param.icon-png.name"),
             I18N.getString("param.icon-png.description"),
             "icon.png",
             File.class,

@@ -96,34 +103,24 @@
 //                    return null;
 //                }
 //            });
 //
 
-    private final Path root;
-    private final Path appDir;
-    private final Path runtimeRoot;
-    private final Path mdir;
-    private final String jimage;
-
-    private final Map<String, ? super Object> params;
-
     public LinuxAppImageBuilder(Map<String, Object> config, Path imageOutDir) throws IOException {
         super(config, imageOutDir.resolve(APP_NAME.fetchFrom(config) + "/runtime"));
 
         Objects.requireNonNull(imageOutDir);
 
-        @SuppressWarnings("unchecked")
-        String img = (String) config.get("jimage.name"); // FIXME constant
-        jimage = img == null ? "bootmodules.jimage" : img; //FIXME constant
+        //@SuppressWarnings("unchecked")
+        //String img = (String) config.get("jimage.name"); // FIXME constant
 
         this.root = imageOutDir.resolve(APP_NAME.fetchFrom(config));
         this.appDir = root.resolve("app");
         this.runtimeRoot = root.resolve("runtime");
-        this.mdir = runtimeRoot.resolve("lib").resolve("modules");
+        this.mdir = runtimeRoot.resolve("lib");
         this.params = new HashMap<String, Object>();
         config.entrySet().stream().forEach(e -> params.put(e.getKey().toString(), e.getValue()));
-        Files.createDirectories(mdir);
         Files.createDirectories(appDir);
     }
 
     private Path destFile(String dir, String filename) {
         return runtimeRoot.resolve(dir).resolve(filename);