72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
diff --git a/config/os/gnu-linux/sanitycheck.c b/config/os/gnu-linux/sanitycheck.c
|
|
index f8449f20..ab0fa8bd 100644
|
|
--- a/config/os/gnu-linux/sanitycheck.c
|
|
+++ b/config/os/gnu-linux/sanitycheck.c
|
|
@@ -33,14 +33,10 @@ int sanitycheck (int care_about_realtime,
|
|
errors++;
|
|
relogin++;
|
|
fprintf (stderr, "\nJACK is running in realtime mode, but you are not allowed to use realtime scheduling.\n");
|
|
+ fprintf (stderr, "Please use the prlimit command like: \n");
|
|
+ fprintf (stderr, " prlimit --rtprio=99 jackd [options] \n");
|
|
|
|
- if (!system_has_rtprio_limits_conf ()) {
|
|
- errors++;
|
|
- relogin++;
|
|
- fprintf (stderr, "Please check your /etc/security/limits.conf for the following line\n");
|
|
- fprintf (stderr, "and correct/add it if necessary:\n\n");
|
|
- fprintf (stderr, " @audio - rtprio 99\n");
|
|
- } else if (!system_has_audiogroup ()) {
|
|
+ if (!system_has_audiogroup ()) {
|
|
errors++;
|
|
relogin++;
|
|
fprintf (stderr, "\nYour system has no audio group. Please add it by executing (as root):\n");
|
|
diff --git a/config/os/gnu-linux/systemtest.c b/config/os/gnu-linux/systemtest.c
|
|
index 957abe8a..9e77f378 100644
|
|
--- a/config/os/gnu-linux/systemtest.c
|
|
+++ b/config/os/gnu-linux/systemtest.c
|
|
@@ -156,25 +156,6 @@ static gid_t get_group_by_name (const char* name)
|
|
return res;
|
|
}
|
|
|
|
-/***
|
|
- * Checks for a definition in /etc/security/limits.conf that looks
|
|
- * as if it allows RT scheduling priority.
|
|
- *
|
|
- * @returns 1 if there appears to be such a line
|
|
- **/
|
|
-int system_has_rtprio_limits_conf ()
|
|
-{
|
|
- const char* limits = "/etc/security/limits.conf";
|
|
- char cmd[100];
|
|
-
|
|
- snprintf (cmd, sizeof(cmd), "grep -q 'rtprio *[0-9][0-9]*' %s", limits);
|
|
- if (system (cmd) == 0) {
|
|
- return 1;
|
|
- }
|
|
- return 0;
|
|
-}
|
|
-
|
|
-
|
|
/**
|
|
* Checks for the existence of the 'audio' group on this system
|
|
*
|
|
diff --git a/include/systemtest.h b/include/systemtest.h
|
|
index 9445372a..969ee545 100644
|
|
--- a/include/systemtest.h
|
|
+++ b/include/systemtest.h
|
|
@@ -32,14 +32,6 @@ int system_has_frequencyscaling();
|
|
int system_uses_frequencyscaling();
|
|
|
|
|
|
-/***
|
|
- * Checks for a definition in /etc/security/limits.conf that looks
|
|
- * as if it allows RT scheduling priority.
|
|
- *
|
|
- * @returns 1 if there appears to be such a line
|
|
- **/
|
|
-int system_has_rtprio_limits_conf();
|
|
-
|
|
/**
|
|
* Checks for the existence of the 'audio' group on this system
|
|
*
|