- Fix questionable correctness of autodetect procedure and switch to using

kern.disks in place of ls /dev/da*[0-9].

PR:		ports/135213
Submitted by:	Dmitry Morozovsky <marck@freebsd.org> (maintainer)
This commit is contained in:
Wesley Shields 2009-06-03 18:12:30 +00:00
parent 8c42a4abcc
commit eed1fb4787
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=235132
4 changed files with 6 additions and 4 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= smartmontools PORTNAME= smartmontools
PORTVERSION= 5.38 PORTVERSION= 5.38
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}

View file

@ -16,7 +16,7 @@ smartctl=%%PREFIX%%/sbin/smartctl
case "${daily_status_smart_devices}" in case "${daily_status_smart_devices}" in
# XXX AUTO mode selects only regular ad/da disks # XXX AUTO mode selects only regular ad/da disks
[Aa][Uu][Tt][Oo]) [Aa][Uu][Tt][Oo])
daily_status_smart_devices=`ls /dev/da*[0-9] /dev/ad*[0-9] 2>/dev/null` daily_status_smart_devices=`sysctl -n kern.disks`
;; ;;
*) ;; *) ;;
esac esac
@ -35,6 +35,7 @@ trap "rm -f ${tmpfile}" 0 1 3 15
rc=0 rc=0
case "${daily_status_smart_enable}" in case "${daily_status_smart_enable}" in
[Yy][Ee][Ss]) [Yy][Ee][Ss])
cd /dev
for device in ${daily_status_smart_devices}; do for device in ${daily_status_smart_devices}; do
if [ -e ${device} ]; then if [ -e ${device} ]; then
echo echo

View file

@ -7,7 +7,7 @@
PORTNAME= smartmontools PORTNAME= smartmontools
PORTVERSION= 5.38 PORTVERSION= 5.38
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}

View file

@ -16,7 +16,7 @@ smartctl=%%PREFIX%%/sbin/smartctl
case "${daily_status_smart_devices}" in case "${daily_status_smart_devices}" in
# XXX AUTO mode selects only regular ad/da disks # XXX AUTO mode selects only regular ad/da disks
[Aa][Uu][Tt][Oo]) [Aa][Uu][Tt][Oo])
daily_status_smart_devices=`ls /dev/da*[0-9] /dev/ad*[0-9] 2>/dev/null` daily_status_smart_devices=`sysctl -n kern.disks`
;; ;;
*) ;; *) ;;
esac esac
@ -35,6 +35,7 @@ trap "rm -f ${tmpfile}" 0 1 3 15
rc=0 rc=0
case "${daily_status_smart_enable}" in case "${daily_status_smart_enable}" in
[Yy][Ee][Ss]) [Yy][Ee][Ss])
cd /dev
for device in ${daily_status_smart_devices}; do for device in ${daily_status_smart_devices}; do
if [ -e ${device} ]; then if [ -e ${device} ]; then
echo echo