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_config.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_config.erl')
| -rw-r--r-- | src/rlx_config.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rlx_config.erl b/src/rlx_config.erl index d82757b..3c3ba98 100644 --- a/src/rlx_config.erl +++ b/src/rlx_config.erl @@ -250,8 +250,12 @@ load_terms({release, {RelName, Vsn}, Applications, Config}, {ok, State0}) -> Release2 = rlx_release:config(Release1, Config), {ok, rlx_state:add_configured_release(State0, Release2)} end; +load_terms({vm_args, false}, {ok, State}) -> + {ok, rlx_state:vm_args(State, false)}; load_terms({vm_args, VmArgs}, {ok, State}) -> {ok, rlx_state:vm_args(State, filename:absname(VmArgs))}; +load_terms({sys_config, false}, {ok, State}) -> + {ok, rlx_state:sys_config(State, false)}; load_terms({sys_config, SysConfig}, {ok, State}) -> {ok, rlx_state:sys_config(State, filename:absname(SysConfig))}; load_terms({root_dir, Root}, {ok, State}) -> |