diff options
author | Mike Frysinger <vapier@gentoo.org> | 2007-08-25 18:17:05 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2007-08-25 18:17:05 +0000 |
commit | 4a23e42be85333dccc39cca6555b96a065ff3855 (patch) | |
tree | eecae582e6dc55f13b56f537b777befc2ed6d1ae | |
parent | 9cf4628aaa780eb8173c7184d5ccf4f0f3b1abb1 (diff) |
Make sure we list all config files in rc help output.
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | sh/rc-help.sh | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,9 +1,13 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2 + 25 Aug 2007; Mike Frysinger <vapier@gentoo.org>: + + Make sure we list all config files in rc help output. + 22 Aug 2007; Roy Marples <uberlord@gentoo.org>: - Only open /proc/cmdline if it exists, #189686 thanks to Christian Affolter + Only open /proc/cmdline if it exists, #189686 thanks to Christian Affolter. 21 Aug 2007; Roy Marples <uberlord@gentoo.org>: diff --git a/sh/rc-help.sh b/sh/rc-help.sh index a4b8ce13..789537cf 100755 --- a/sh/rc-help.sh +++ b/sh/rc-help.sh @@ -230,11 +230,13 @@ ${CYAN}Configuration files:${OFF} if [ "${BE_VERBOSE}" = "yes" ] ; then printf " There are two files which will be sourced for possible configuration by - the rc-scripts. They are (sourced from top to bottom): + the rc-scripts. They are (sourced from left to right, top to bottom): " fi -printf " /etc/conf.d/${SERVICE}${NL} /etc/rc.conf" +printf " /etc/conf.d/rc${NL:- } /etc/conf.d/rc.${SOFTLEVEL}" +printf " /etc/conf.d/${SERVICE}${NL} /etc/conf.d/${SERVICE}.${SOFTLEVEL}" +printf " /etc/rc.conf" if [ "${BE_VERBOSE}" = "yes" ] ; then printf " |