From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 26 11:10:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 549661065677 for ; Tue, 26 May 2009 11:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2FCC18FC1B for ; Tue, 26 May 2009 11:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QBA3n6084380 for ; Tue, 26 May 2009 11:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n4QBA3vg084379; Tue, 26 May 2009 11:10:03 GMT (envelope-from gnats) Resent-Date: Tue, 26 May 2009 11:10:03 GMT Resent-Message-Id: <200905261110.n4QBA3vg084379@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Morozovsky Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B04F110656C3 for ; Tue, 26 May 2009 11:07:51 +0000 (UTC) (envelope-from marck@woozle.rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by mx1.freebsd.org (Postfix) with ESMTP id 15BF18FC32 for ; Tue, 26 May 2009 11:07:50 +0000 (UTC) (envelope-from marck@woozle.rinet.ru) Received: from woozle.rinet.ru (localhost [127.0.0.1]) by woozle.rinet.ru (8.14.3/8.14.3) with ESMTP id n4QArIvF087477 for ; Tue, 26 May 2009 14:53:18 +0400 (MSD) (envelope-from marck@woozle.rinet.ru) Received: (from marck@localhost) by woozle.rinet.ru (8.14.3/8.14.3/Submit) id n4QArIJe087476; Tue, 26 May 2009 14:53:18 +0400 (MSD) (envelope-from marck) Message-Id: <200905261053.n4QArIJe087476@woozle.rinet.ru> Date: Tue, 26 May 2009 14:53:18 +0400 (MSD) From: Dmitry Morozovsky To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/134954: sysutils/smartmontools fix for daily script X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Morozovsky List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 11:10:03 -0000 >Number: 134954 >Category: ports >Synopsis: sysutils/smartmontools fix for daily script >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue May 26 11:10:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dmitry Morozovsky >Release: FreeBSD 7-STABLE i386 >Organization: Cronyx Plus LLC (RiNet ISP) >Environment: System: FreeBSD 7-STABLE >Description: Fix typo in smart periodic script. Add simple autodetect mode (works only for regular disks). >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/smartmontools/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- Makefile 25 May 2009 12:28:25 -0000 1.38 +++ Makefile 26 May 2009 10:51:29 -0000 @@ -7,7 +7,7 @@ PORTNAME= smartmontools PORTVERSION= 5.38 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} Index: files/smart.in =================================================================== RCS file: /home/ncvs/ports/sysutils/smartmontools/files/smart.in,v retrieving revision 1.3 diff -u -r1.3 smart.in --- files/smart.in 31 Dec 2008 16:58:11 -0000 1.3 +++ files/smart.in 26 May 2009 10:51:29 -0000 @@ -12,12 +12,21 @@ smartctl=%%PREFIX%%/sbin/smartctl : ${daily_status_smartctl_flags="-H"} : ${daily_status_smartctl_extra_status_flags="-a"} -# no default for ${daily_status_smart_devices} + +case "${daily_status_smart_devices}" in + # XXX AUTO mode selects only regular ad/da disks + [Aa][Uu][Tt][Oo]) + daily_status_smart_devices=`ls /dev/da*[0-9] /dev/ad*[0-9] 2>/dev/null` + ;; + *) ;; +esac + if [ -z "${daily_status_smart_devices}" ]; then - : ${daily_status_smart_enabled="NO"} + : ${daily_status_smart_enable="NO"} else - : ${daily_status_smart_enabled="YES"} + : ${daily_status_smart_enable="YES"} fi + trim_junk="tail -n +4" tmpfile="$(mktemp /var/run/daily.XXXXXXXX)" @@ -25,9 +34,7 @@ rc=0 case "${daily_status_smart_enable}" in - [Nn][Oo]) - ;; - *) + [Yy][Ee][Ss]) for device in ${daily_status_smart_devices}; do if [ -e ${device} ]; then echo >Release-Note: >Audit-Trail: >Unformatted: