From owner-freebsd-bugs@FreeBSD.ORG Fri Mar 15 15:00:08 2013 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DE8119E6 for ; Fri, 15 Mar 2013 15:00:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id ABC54782 for ; Fri, 15 Mar 2013 15:00:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2FF089s057229 for ; Fri, 15 Mar 2013 15:00:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2FF08JM057228; Fri, 15 Mar 2013 15:00:08 GMT (envelope-from gnats) Resent-Date: Fri, 15 Mar 2013 15:00:08 GMT Resent-Message-Id: <201303151500.r2FF08JM057228@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Brovikov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 171A5909 for ; Fri, 15 Mar 2013 14:57:56 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id E450074E for ; Fri, 15 Mar 2013 14:57:55 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2FEvsr8033220 for ; Fri, 15 Mar 2013 14:57:54 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r2FEvs8F033219; Fri, 15 Mar 2013 14:57:54 GMT (envelope-from nobody) Message-Id: <201303151457.r2FEvs8F033219@red.freebsd.org> Date: Fri, 15 Mar 2013 14:57:54 GMT From: Alexander Brovikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: misc/176995: [patch] add config testing to net/quagga rc script X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2013 15:00:08 -0000 >Number: 176995 >Category: misc >Synopsis: [patch] add config testing to net/quagga rc script >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Mar 15 15:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Alexander Brovikov >Release: 9.1-RELEASE >Organization: >Environment: FreeBSD XXXXXX 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: >How-To-Repeat: >Fix: Attached patch adds config files testing before running start/restart command. Patch attached with submission follows: --- /usr/local/etc/rc.d/quagga.orig 2013-03-15 16:49:13.000000000 +0600 +++ /usr/local/etc/rc.d/quagga 2013-03-15 20:50:59.000000000 +0600 @@ -32,6 +32,20 @@ start_postcmd=start_postcmd stop_postcmd=stop_postcmd +configtest_cmd="check_config" +extra_commands="configtest" + +check_config() { + echo Checking $daemon.conf + $command $daemon_flags -C + result=$? + if [ "$result" -eq "0" ]; then + echo OK + else + echo FAILED + exit + fi +} start_postcmd() { @@ -61,6 +75,9 @@ command=/usr/local/sbin/${daemon} required_files=/usr/local/etc/quagga/${daemon}.conf pidfile=/var/run/quagga/${daemon}.pid + if [ ${quagga_cmd} = "restart" -o ${quagga_cmd} = "start" ]; then + check_config + fi if [ ${quagga_cmd} = "start" -a ! -f ${required_files} ]; then continue fi >Release-Note: >Audit-Trail: >Unformatted: