diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:42:03 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:42:03 -0300 |
| commit | 007d3d6585cb982c1ed6518ff9c6be0f09484330 (patch) | |
| tree | 2db02416302b51bf41fa5f80a405915f504b85b5 | |
| parent | 34aefac884f7fa4f4c6ab3142ef6db3a7f6f6842 (diff) | |
| download | FreeBSD-src-007d3d6585cb982c1ed6518ff9c6be0f09484330.zip FreeBSD-src-007d3d6585cb982c1ed6518ff9c6be0f09484330.tar.gz | |
Revert "Revert "MFC r324113:""
This reverts commit e8f1248046c257a8b83766f04f4f20f6e287fc0f.
| -rw-r--r-- | usr.sbin/cpucontrol/cpucontrol.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/cpucontrol/cpucontrol.c b/usr.sbin/cpucontrol/cpucontrol.c index 48e12e7..6760b83 100644 --- a/usr.sbin/cpucontrol/cpucontrol.c +++ b/usr.sbin/cpucontrol/cpucontrol.c @@ -60,6 +60,7 @@ int verbosity_level = 0; #define FLAG_I 0x01 #define FLAG_M 0x02 #define FLAG_U 0x04 +#define FLAG_N 0x08 #define OP_INVAL 0x00 #define OP_READ 0x01 @@ -427,11 +428,7 @@ main(int argc, char *argv[]) error = 0; cmdarg = ""; /* To keep gcc3 happy. */ - /* - * Add all default data dirs to the list first. - */ - datadir_add(DEFAULT_DATADIR); - while ((c = getopt(argc, argv, "d:hi:m:uv")) != -1) { + while ((c = getopt(argc, argv, "d:hi:m:nuv")) != -1) { switch (c) { case 'd': datadir_add(optarg); @@ -444,6 +441,9 @@ main(int argc, char *argv[]) flags |= FLAG_M; cmdarg = optarg; break; + case 'n': + flags |= FLAG_N; + break; case 'u': flags |= FLAG_U; break; @@ -463,6 +463,8 @@ main(int argc, char *argv[]) usage(); /* NOTREACHED */ } + if ((flags & FLAG_N) == 0) + datadir_add(DEFAULT_DATADIR); dev = argv[0]; c = flags & (FLAG_I | FLAG_M | FLAG_U); switch (c) { |
