From owner-cvs-all Mon Oct 1 0:32:32 2001 Delivered-To: cvs-all@freebsd.org Received: from goliath.siemens.de (goliath.siemens.de [194.138.37.131]) by hub.freebsd.org (Postfix) with ESMTP id 4C0C537B413; Mon, 1 Oct 2001 00:27:20 -0700 (PDT) Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.11.6/8.11.6) with ESMTP id f917RIl00207; Mon, 1 Oct 2001 09:27:18 +0200 (MET DST) Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17]) by mail2.siemens.de (8.11.6/8.11.6) with ESMTP id f917RIE12703; Mon, 1 Oct 2001 09:27:18 +0200 (MEST) Received: from reims.mchp.siemens.de (alaska [139.23.202.134]) by mars.cert.siemens.de (8.12.0/8.12.0/Siemens CERT [ $Revision: 1.17 ]) with ESMTP id f917RHLD036992; Mon, 1 Oct 2001 09:27:17 +0200 (CEST) Received: from reims.mchp.siemens.de (localhost [127.0.0.1]) by reims.mchp.siemens.de (8.12.0/8.12.0/alaska [ $Revision: 1.8 ]) with ESMTP id f917RHrq057816; Mon, 1 Oct 2001 09:27:17 +0200 (CEST) Received: (from ust@localhost) by reims.mchp.siemens.de (8.12.0/8.12.0/alaska [ $Revision: 1.2 ]) id f917RHiX057815; Mon, 1 Oct 2001 09:27:17 +0200 (CEST) Date: Mon, 1 Oct 2001 09:27:17 +0200 From: Udo Schweigert To: "David O'Brien" Cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/etc rc Message-ID: <20011001092717.A57657@alaska.cert.siemens.de> Mail-Followup-To: David O'Brien , cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG References: <200109250155.f8P1tMR19221@freefall.freebsd.org> <20010930160801.A30603@alaska.cert.siemens.de> <20010930150859.B85562@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20010930150859.B85562@dragon.nuxi.com> User-Agent: Mutt/1.3.22.1i X-Operating-System: FreeBSD 4.4-STABLE Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Sep 30, 2001 at 15:08:59 -0700, David O'Brien wrote: > On Sun, Sep 30, 2001 at 04:08:01PM +0200, Udo Schweigert wrote: >> This gives a message if the startup directory is empty. The attached patch >> fixes this. > > Great! I knew about the bug. I'm ashamed to admit this fix did not come > to mind as a way to fix it. > Sorry for again replying, but I not saw Dag's suggestion before. Here is a patch which also does the right echo command and handles the file globbing. Best regards -- Udo Schweigert, Siemens AG | Voice : +49 89 636 42170 CT IC 3, Siemens CERT | Fax : +49 89 636 41166 D-81730 Muenchen / Germany | email : udo.schweigert@siemens.com --- /usr/src/etc/rc Mon Oct 1 07:11:03 2001 +++ rc Mon Oct 1 09:23:40 2001 @@ -795,7 +795,9 @@ for dir in ${local_startup}; do if [ -d "${dir}" ]; then for script in ${dir}/*.sh; do - slist="${slist}${script_name_sep}${script}" + if [ "${script}" != "${dir}/*.sh" ]; then + slist="${slist}${script_name_sep}${script}" + fi done fi done @@ -806,8 +808,8 @@ (set -T trap 'exit 1' 2 ${script} start) - elif [ -f "${script}" ]; then - echo "Skipping ${script}, not executable" + else + echo -n " (skipping ${script##*/})" fi done IFS="${script_save_sep}" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message