aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-10-11 11:08:30 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-10-11 11:08:30 +0200
commit9d3fc7af810302009c031c642be7c867e211d815 (patch)
tree3c7fcd05e617f9570175474eb4c71d1e66baf54d
parentae2dc9839aaefa6c50da75917bb82f7a1545d3ad (diff)
parent4eb450460e0c42506782732d867ae378ba872d56 (diff)
downloadotp-9d3fc7af810302009c031c642be7c867e211d815.tar.gz
otp-9d3fc7af810302009c031c642be7c867e211d815.tar.bz2
otp-9d3fc7af810302009c031c642be7c867e211d815.zip
Merge branch 'egil/erts/fix-profile_boot-flag/ERL-280/OTP-13955' into maint
* egil/erts/fix-profile_boot-flag/ERL-280/OTP-13955: Update preloaded init.beam erts: Fix -profile_boot 'true'|'false' parsing
-rw-r--r--erts/preloaded/ebin/init.beambin50032 -> 50040 bytes
-rw-r--r--erts/preloaded/src/init.erl4
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index 849273f746..74a0184818 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
Binary files differ
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index 962528f7ab..551ca4ea40 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -205,7 +205,7 @@ boot(BootArgs) ->
{Start0,Flags,Args} = parse_boot_args(BootArgs),
%% We don't get to profile parsing of BootArgs
- case get_flag(profile_boot, Flags, false) of
+ case b2a(get_flag(profile_boot, Flags, false)) of
false -> ok;
true -> debug_profile_start()
end,
@@ -782,7 +782,7 @@ do_boot(Init,Flags,Start) ->
(catch erlang:system_info({purify, "Node: " ++ atom_to_list(node())})),
start_em(Start),
- case get_flag(profile_boot,Flags,false) of
+ case b2a(get_flag(profile_boot,Flags,false)) of
false -> ok;
true ->
debug_profile_format_mfas(debug_profile_mfas()),