From 4a23e42be85333dccc39cca6555b96a065ff3855 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 25 Aug 2007 18:17:05 +0000 Subject: Make sure we list all config files in rc help output. --- ChangeLog | 6 +++++- sh/rc-help.sh | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bcc71ac7..657182a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 : + + Make sure we list all config files in rc help output. + 22 Aug 2007; Roy Marples : - 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 : 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 " -- cgit v1.2.3