summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/rabbit_prelaunch.erl2
-rw-r--r--src/rabbit_upgrade.erl1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index 612aec8000..3283e8fd28 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -235,6 +235,8 @@ post_process_script(ScriptFile) ->
{error, {failed_to_load_script, Reason}}
end.
+process_entry(Entry = {apply,{application,start_boot,[rabbit,permanent]}}) ->
+ [{apply,{rabbit,prepare,[]}}, Entry];
process_entry(Entry = {apply,{application,start_boot,[mnesia,permanent]}}) ->
[{apply,{rabbit_upgrade,maybe_upgrade_mnesia,[]}}, Entry];
process_entry(Entry) ->
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl
index c8d2ae877d..73b9bb0e7e 100644
--- a/src/rabbit_upgrade.erl
+++ b/src/rabbit_upgrade.erl
@@ -46,7 +46,6 @@
%% -------------------------------------------------------------------
maybe_upgrade_mnesia() ->
- rabbit:prepare(),
Nodes = rabbit_mnesia:all_clustered_nodes(),
case upgrades_required(mnesia) of
version_not_available ->