diff options
author | smitsohu <smitsohu@gmail.com> | 2021-09-22 20:12:58 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2021-09-22 20:12:58 +0200 |
commit | 921c9cc153174434c6464498274ae0ae9ca51efd (patch) | |
tree | 88a1df516d51b04432998458c177929113de6720 /src | |
parent | hardcode PATH for internal use (diff) | |
download | firejail-921c9cc153174434c6464498274ae0ae9ca51efd.tar.gz firejail-921c9cc153174434c6464498274ae0ae9ca51efd.tar.zst firejail-921c9cc153174434c6464498274ae0ae9ca51efd.zip |
join: add support for rlimit options
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/join.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/firejail/join.c b/src/firejail/join.c index 99fbfdd0a..a869f6b64 100644 --- a/src/firejail/join.c +++ b/src/firejail/join.c | |||
@@ -551,10 +551,6 @@ void join(pid_t pid, int argc, char **argv, int index) { | |||
551 | if (cfg.cpus) // not available for uid 0 | 551 | if (cfg.cpus) // not available for uid 0 |
552 | set_cpu_affinity(); | 552 | set_cpu_affinity(); |
553 | 553 | ||
554 | // set nice value | ||
555 | if (arg_nice) | ||
556 | set_nice(cfg.nice); | ||
557 | |||
558 | // add x11 display | 554 | // add x11 display |
559 | if (display) { | 555 | if (display) { |
560 | char *display_str; | 556 | char *display_str; |
@@ -573,6 +569,11 @@ void join(pid_t pid, int argc, char **argv, int index) { | |||
573 | dbus_set_system_bus_env(); | 569 | dbus_set_system_bus_env(); |
574 | #endif | 570 | #endif |
575 | 571 | ||
572 | // set nice and rlimits | ||
573 | if (arg_nice) | ||
574 | set_nice(cfg.nice); | ||
575 | set_rlimits(); | ||
576 | |||
576 | start_application(0, shfd, NULL); | 577 | start_application(0, shfd, NULL); |
577 | 578 | ||
578 | __builtin_unreachable(); | 579 | __builtin_unreachable(); |