summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2013-02-01 16:15:17 +0100
committerNeilBrown <neilb@suse.de>2013-02-05 15:06:47 +1100
commit3e23ba9d7bd3c2a9fbddc286014480672763e563 (patch)
tree71ac8d36f35cd2099b5747da00a3fcc00be33659 /util.c
parente31dec228bbe68c55f8e601500f82c9492c96aae (diff)
Remove --offroot argument and default to always setting argv[0] to @
We still allow --offroot to be given - for compatibility with scripts - but ignore it. The whole point of --offroot is to get systemd to not auto-kill mdmon, and we always want that. Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'util.c')
-rw-r--r--util.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/util.c b/util.c
index fc9043bf..e75b7549 100644
--- a/util.c
+++ b/util.c
@@ -32,8 +32,6 @@
#include <dirent.h>
#include <signal.h>
-int __offroot;
-
/*
* following taken from linux/blkpg.h because they aren't
* anywhere else and it isn't safe to #include linux/ * stuff.
@@ -1674,15 +1672,8 @@ int start_mdmon(int devnum)
for (i = 0; paths[i]; i++)
if (paths[i][0]) {
- if (__offroot) {
- execl(paths[i], "mdmon", "--offroot",
- devnum2devname(devnum),
- NULL);
- } else {
- execl(paths[i], "mdmon",
- devnum2devname(devnum),
- NULL);
- }
+ execl(paths[i], "mdmon",
+ devnum2devname(devnum), NULL);
}
exit(1);
case -1: pr_err("cannot run mdmon. "