Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes to build and packaging #2

Merged
merged 7 commits into from
Mar 28, 2024
Merged

Minor fixes to build and packaging #2

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9af55a8
echo is not the most portable method to pipe output. In some systems,…
aef- Apr 14, 2023
1840fe5
Minor fixes to build and packaging
martinsumner Feb 7, 2024
dfd4354
Place compile on correct line
martinsumner Feb 29, 2024
c31a5c8
revert no-lintian
martinsumner Feb 29, 2024
0e6b62f
Merge remote-tracking branch 'aef-/aef-/update-riak-admin-escape' int…
martinsumner Mar 1, 2024
c68c125
Change break handler to translation
martinsumner Mar 1, 2024
c7dd7b3
Unset if break_signal false
martinsumner Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ PKG_ID := "$(REPO_TAG)-OTP$(OTP_VER)"
# which differs from $REVISION that is repo-<commitcount>-<commitsha>
PKG_VERSION = $(shell echo $(PKG_ID) | sed -e 's/^$(REPO)-//')

package:
package: compile
mkdir -p rel/pkg/out/$(PKG_ID)
git archive --format=tar HEAD | gzip >rel/pkg/out/$(PKG_ID).tar.gz
$(MAKE) -f rel/pkg/Makefile
Expand Down
16 changes: 14 additions & 2 deletions priv/riak.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,23 @@
]}.

%% VM emulator ignore break signal (prevent ^C / ^Gq)
{mapping, "erlang.vm.ignore_break_signal", "vm_args.+Bi", [
{default, "true"},
{mapping, "erlang.vm.ignore_break_signal", "vm_args.+B", [
{default, true},
{datatype, {enum, [true, false]}},
merge
]}.

{translation,
"vm_args.+B",
fun(Conf) ->
Setting = cuttlefish:conf_get("erlang.vm.ignore_break_signal", Conf),
case Setting of
true -> "i";
false -> "c"
martinsumner marked this conversation as resolved.
Show resolved Hide resolved
end
end
}.

%% @doc The VM single block carrier threshold (KB) for process heap
{mapping, "erlang.eheap_memory.sbct", "vm_args.+MHsbct", [
{commented, 512},
Expand Down
2 changes: 1 addition & 1 deletion rel/files/riak-admin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ The following commands modify users and security ACLs for Riak:
}

escape() {
echo -n "$1" | sed 's/"/\\"/g'
printf '%s' "$1" | sed 's/"/\\"/g'
}

btype_admin()
Expand Down
1 change: 1 addition & 0 deletions rel/pkg/deb/debian/riak.riak.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Type=simple
PIDFile=/run/riak/riak.pid
EnvironmentFile=-/etc/default/riak
RuntimeDirectory=riak
LimitNOFILE=524288

[Install]
WantedBy=multi-user.target
2 changes: 1 addition & 1 deletion rel/vars/dev_vars.config.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{sasl_log_dir, "{{platform_log_dir}}/sasl"}.
{repl_data_root, "{{platform_data_dir}}/riak_repl/"}.

{logger_level, debug}.
{logger_level, info}.

%%
%% etc/vm.args
Expand Down