diff options
author | Jordan Wilberding <[email protected]> | 2016-02-19 11:08:17 -0800 |
---|---|---|
committer | Jordan Wilberding <[email protected]> | 2016-02-19 11:08:17 -0800 |
commit | e29f0ec6820abbf692fa878f8fb284911d5a3813 (patch) | |
tree | a11f102b447ecd2d80bae6d697527eef93fd8e9c /src/rlx_prv_assembler.erl | |
parent | b373b201e6d2c55333ef10de8db7c1d06fa65191 (diff) | |
parent | 7b8e79bf16bbe8703f15f1ee8acedb8ab36c1c52 (diff) | |
download | relx-e29f0ec6820abbf692fa878f8fb284911d5a3813.tar.gz relx-e29f0ec6820abbf692fa878f8fb284911d5a3813.tar.bz2 relx-e29f0ec6820abbf692fa878f8fb284911d5a3813.zip |
Merge pull request #449 from tsloughter/masterv3.17.0
Couple fixes related to vm.args and sys.config
Diffstat (limited to 'src/rlx_prv_assembler.erl')
-rw-r--r-- | src/rlx_prv_assembler.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl index 8e0050c..2f08005 100644 --- a/src/rlx_prv_assembler.erl +++ b/src/rlx_prv_assembler.erl @@ -410,6 +410,8 @@ generate_start_erl_data_file(Release, ReleasesDir) -> copy_or_generate_vmargs_file(State, Release, RelDir) -> RelVmargsPath = filename:join([RelDir, "vm.args"]), case rlx_state:vm_args(State) of + false -> + ok; undefined -> RelName = erlang:atom_to_list(rlx_release:name(Release)), unless_exists_write_default(RelVmargsPath, vm_args_file(RelName)); @@ -428,6 +430,8 @@ copy_or_generate_vmargs_file(State, Release, RelDir) -> copy_or_generate_sys_config_file(State, RelDir) -> RelSysConfPath = filename:join([RelDir, "sys.config"]), case rlx_state:sys_config(State) of + false -> + ok; undefined -> unless_exists_write_default(RelSysConfPath, sys_config_file()); ConfigPath -> |