diff options
author | William Hubbs <williamh@gentoo.org> | 2012-01-30 13:12:40 -0600 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2012-01-30 13:24:54 -0600 |
commit | 7da8394a8edc068e1cd2e04eaf179d1d6e1c1cb7 (patch) | |
tree | d8dfe873429af38e2e9bf3d6df4d672513ec5f23 /src | |
parent | 0ff23f20e88279fea27a110fc5d56ed760689806 (diff) | |
download | openrc-7da8394a8edc068e1cd2e04eaf179d1d6e1c1cb7.tar.gz openrc-7da8394a8edc068e1cd2e04eaf179d1d6e1c1cb7.tar.bz2 openrc-7da8394a8edc068e1cd2e04eaf179d1d6e1c1cb7.tar.xz |
Complain about loading /etc/conf.d/rc
Openrc was quietly loading this file if it existed and this was causing
some issues, so now openrc loads the file and complains about it.
Hopefully the warning message will convince everyone to remove this file
and migrate the settings to @SYSCONFDIR@/rc.conf where they belong.
Diffstat (limited to 'src')
-rw-r--r-- | src/librc/librc-misc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c index 7e9a109..6e9fce6 100644 --- a/src/librc/librc-misc.c +++ b/src/librc/librc-misc.c @@ -392,10 +392,13 @@ rc_conf_value(const char *setting) atexit(_free_rc_conf); #endif - /* Support old configs */ + /* Support old configs, but complain about it. */ if (exists(RC_CONF_OLD)) { old = rc_config_load(RC_CONF_OLD); TAILQ_CONCAT(rc_conf, old, entries); + ewarn("Your system still has %s", RC_CONF_OLD); + ewarn("Please migrate to the appropriate settings in %s", RC_CONF); + ewarn("and delete %s.", RC_CONF_OLD); #ifdef DEBUG_MEMORY free(old); #endif |