aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-05-02 12:33:56 +0000
committerRoy Marples <roy@marples.name>2007-05-02 12:33:56 +0000
commitc3608471cd4f6808ed90d4185eda9424cf25e6ab (patch)
tree161329101e7b9ab24856781ca0875428eef8a353 /src
parentd599a406801139eab7baffdd6c6c785da787d58c (diff)
SSD_NICELEVEL can now affect the nicelevel for daemons started
by start-stop-daemon, #175397.
Diffstat (limited to 'src')
-rw-r--r--src/librc-misc.c12
-rw-r--r--src/start-stop-daemon.c4
2 files changed, 10 insertions, 6 deletions
diff --git a/src/librc-misc.c b/src/librc-misc.c
index a2b38b4a..36d9b318 100644
--- a/src/librc-misc.c
+++ b/src/librc-misc.c
@@ -6,14 +6,14 @@
#include "librc.h"
-#define ERRX eerrorx("out of memory");
+#define ERRX eerrorx("out of memory");
-#define PROFILE_ENV "/etc/profile.env"
-#define SYS_WHITELIST RC_LIBDIR "conf.d/env_whitelist"
-#define USR_WHITELIST "/etc/conf.d/env_whitelist"
-#define RC_CONFIG "/etc/conf.d/rc"
+#define PROFILE_ENV "/etc/profile.env"
+#define SYS_WHITELIST RC_LIBDIR "conf.d/env_whitelist"
+#define USR_WHITELIST "/etc/conf.d/env_whitelist"
+#define RC_CONFIG "/etc/conf.d/rc"
-#define PATH_PREFIX RC_LIBDIR "bin:/bin:/sbin:/usr/bin:/usr/sbin"
+#define PATH_PREFIX RC_LIBDIR "bin:/bin:/sbin:/usr/bin:/usr/sbin"
#ifndef S_IXUGO
# define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH)
diff --git a/src/start-stop-daemon.c b/src/start-stop-daemon.c
index f4f0f99e..62973dc6 100644
--- a/src/start-stop-daemon.c
+++ b/src/start-stop-daemon.c
@@ -537,6 +537,10 @@ int main (int argc, char **argv)
signal (SIGQUIT, handle_signal);
signal (SIGTERM, handle_signal);
+ if ((env = getenv ("SSD_NICELEVEL")))
+ if (sscanf (env, "%d", &nicelevel) != 1)
+ eerror ("%s: invalid nice level `%s' (SSD_NICELEVEL)", progname, env);
+
while ((c = getopt_long (argc, argv,
"KN:R:Sbc:d:g:mn:op:qs:tu:r:vx:1:2:",
longopts, (int *) 0)) != -1)