picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sysctl: make --prefix allow all kinds of sysctl paths

Browse source 
Currently, we save arguments passed as --prefix directly and compare them
later to absolute sysctl file-system paths. That is, you are required to
specify arguments to --prefix with leading /proc/sys/. This is kinda
uselesss. Furthermore, we replace dots by slashes in the name, which makes
it impossible to match on specific sysfs paths that have dots in their
name (like netdev names). The intention of this argument is clear, but it
never worked as expected.

This patch modifies --prefix to accept any kind of sysctl paths. It
supports paths prefixed with /proc/sys for compatibility (but drops the
erroneous dot->slash conversion), but instead applies normalize_sysctl()
which turns any name or path into a proper path. It then appends
/proc/sys/ so we can properly use it in matches.

Thanks to Jan Synacek <jsynacek@redhat.com> for catching this!
This commit is contained in:
David Herrmann 2014-09-17 09:06:49 +02:00
parent 42646a8bf2
commit 0e1f579227
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/sysctl/sysctl.c
View file

@ -219,7 +219,7 @@ static void help(void) {
"Applies kernel sysctl settings.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --prefix=PATH Only apply rules that apply to paths with the specified prefix\n"
" --prefix=PATH Only apply rules with the specified prefix\n"
, program_invocation_short_name);
}
@ -258,11 +258,19 @@ static int parse_argv(int argc, char *argv[]) {
case ARG_PREFIX: {
char *p;
for (p = optarg; *p; p++)
if (*p == '.')
*p = '/';
/* We used to require people to specify absolute paths
* in /proc/sys in the past. This is kinda useless, but
* we need to keep compatibility. We now support any
* sysctl name available. */
normalize_sysctl(optarg);
if (startswith(optarg, "/proc/sys"))
p = strdup(optarg);
else
p = strappend("/proc/sys/", optarg);
if (strv_extend(&arg_prefixes, optarg) < 0)
if (!p)
return log_oom();
if (strv_consume(&arg_prefixes, p) < 0)
return log_oom();
break;