changeset 7181:d674eb219ae7

RT-37384: SERVICE_HINT option is broken in OEL Summary: init script is package name, not app filesystem name. Fix in DEB and RPM builds
author shemnon
date Tue, 03 Jun 2014 08:32:22 -0600
parents 89c7ea2b6709
children f7a7ff507c0e
files modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxDebBundler.java modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxRpmBundler.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxDebBundler.java	Tue Jun 03 19:40:53 2014 -0400
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxDebBundler.java	Tue Jun 03 08:32:22 2014 -0600
@@ -530,7 +530,7 @@
 
     private File getConfig_InitScriptFile(Map<String, ? super Object> params) {
         return new File(LinuxAppBundler.getRootDir(APP_IMAGE_ROOT.fetchFrom(params), params),
-                APP_FS_NAME.fetchFrom(params) + ".init");
+                BUNDLE_NAME.fetchFrom(params) + ".init");
     }
 
     private File getConfig_ControlFile(Map<String, ? super Object> params) {
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxRpmBundler.java	Tue Jun 03 19:40:53 2014 -0400
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxRpmBundler.java	Tue Jun 03 08:32:22 2014 -0600
@@ -366,7 +366,7 @@
 
     private File getConfig_InitScriptFile(Map<String, ? super Object> params) {
         return new File(LinuxAppBundler.getRootDir(RPM_IMAGE_DIR.fetchFrom(params), params),
-                APP_FS_NAME.fetchFrom(params) + ".init");
+                BUNDLE_NAME.fetchFrom(params) + ".init");
     }
 
     private File getConfig_SpecFile(Map<String, ? super Object> params) {