| 1 |
commit: 7da8394a8edc068e1cd2e04eaf179d1d6e1c1cb7 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 19:12:40 2012 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 19:24:54 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7da8394a |
| 7 |
|
| 8 |
Complain about loading /etc/conf.d/rc |
| 9 |
|
| 10 |
Openrc was quietly loading this file if it existed and this was causing |
| 11 |
some issues, so now openrc loads the file and complains about it. |
| 12 |
|
| 13 |
Hopefully the warning message will convince everyone to remove this file |
| 14 |
and migrate the settings to @SYSCONFDIR <AT> /rc.conf where they belong. |
| 15 |
|
| 16 |
--- |
| 17 |
src/librc/librc-misc.c | 5 ++++- |
| 18 |
1 files changed, 4 insertions(+), 1 deletions(-) |
| 19 |
|
| 20 |
diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c |
| 21 |
index 7e9a109..6e9fce6 100644 |
| 22 |
--- a/src/librc/librc-misc.c |
| 23 |
+++ b/src/librc/librc-misc.c |
| 24 |
@@ -392,10 +392,13 @@ rc_conf_value(const char *setting) |
| 25 |
atexit(_free_rc_conf); |
| 26 |
#endif |
| 27 |
|
| 28 |
- /* Support old configs */ |
| 29 |
+ /* Support old configs, but complain about it. */ |
| 30 |
if (exists(RC_CONF_OLD)) { |
| 31 |
old = rc_config_load(RC_CONF_OLD); |
| 32 |
TAILQ_CONCAT(rc_conf, old, entries); |
| 33 |
+ ewarn("Your system still has %s", RC_CONF_OLD); |
| 34 |
+ ewarn("Please migrate to the appropriate settings in %s", RC_CONF); |
| 35 |
+ ewarn("and delete %s.", RC_CONF_OLD); |
| 36 |
#ifdef DEBUG_MEMORY |
| 37 |
free(old); |
| 38 |
#endif |
Archives