summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2012-01-24 19:40:59 +0100
committerChristian Ruppert <idl0r@gentoo.org>2012-01-24 19:41:50 +0100
commitced60319e315f4f12418c116b8823817d20839d6 (patch)
tree63e899180b7bb1d24412c291f4b6e4242e18b33d /src
parentcacea4e7f3de67181d54317759e9d3361504cfe4 (diff)
downloadopenrc-ced60319e315f4f12418c116b8823817d20839d6.tar.gz
openrc-ced60319e315f4f12418c116b8823817d20839d6.tar.bz2
openrc-ced60319e315f4f12418c116b8823817d20839d6.tar.xz
Override rc.conf options only
Diffstat (limited to 'src')
-rw-r--r--src/librc/librc-misc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c
index 8b00e36..6a5f598 100644
--- a/src/librc/librc-misc.c
+++ b/src/librc/librc-misc.c
@@ -346,7 +346,10 @@ rc_config_load(const char *file)
rc_stringlist_free(list);
#ifdef __linux__
- config = rc_config_override(config);
+ /* Only override rc.conf settings */
+ if(strcmp(file, RC_CONF) == 0) {
+ config = rc_config_override(config);
+ }
#endif
return config;