diff options
| author | wxs <wxs@FreeBSD.org> | 2009-06-04 02:12:30 +0800 |
|---|---|---|
| committer | wxs <wxs@FreeBSD.org> | 2009-06-04 02:12:30 +0800 |
| commit | 50868c112a7318c8f0de75af04b2362d89fe0903 (patch) | |
| tree | 4e60e4f44d2c756011400b66d68874ef5e971a18 | |
| parent | 1fbc1d3badf87143ae55c4f2e65f4453798d733e (diff) | |
| download | freebsd-ports-gnome-50868c112a7318c8f0de75af04b2362d89fe0903.tar.gz freebsd-ports-gnome-50868c112a7318c8f0de75af04b2362d89fe0903.tar.zst freebsd-ports-gnome-50868c112a7318c8f0de75af04b2362d89fe0903.zip | |
- 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)
| -rw-r--r-- | sysutils/smartmontools-devel/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/smartmontools-devel/files/smart.in | 3 | ||||
| -rw-r--r-- | sysutils/smartmontools/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/smartmontools/files/smart.in | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile index 3ef19babc237..07123e5e9859 100644 --- a/sysutils/smartmontools-devel/Makefile +++ b/sysutils/smartmontools-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= smartmontools PORTVERSION= 5.38 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/sysutils/smartmontools-devel/files/smart.in b/sysutils/smartmontools-devel/files/smart.in index 30db9ab371e6..d4ba696d5212 100644 --- a/sysutils/smartmontools-devel/files/smart.in +++ b/sysutils/smartmontools-devel/files/smart.in @@ -16,7 +16,7 @@ smartctl=%%PREFIX%%/sbin/smartctl 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` + daily_status_smart_devices=`sysctl -n kern.disks` ;; *) ;; esac @@ -35,6 +35,7 @@ trap "rm -f ${tmpfile}" 0 1 3 15 rc=0 case "${daily_status_smart_enable}" in [Yy][Ee][Ss]) + cd /dev for device in ${daily_status_smart_devices}; do if [ -e ${device} ]; then echo diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 3ef19babc237..07123e5e9859 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -7,7 +7,7 @@ PORTNAME= smartmontools PORTVERSION= 5.38 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/sysutils/smartmontools/files/smart.in b/sysutils/smartmontools/files/smart.in index 30db9ab371e6..d4ba696d5212 100644 --- a/sysutils/smartmontools/files/smart.in +++ b/sysutils/smartmontools/files/smart.in @@ -16,7 +16,7 @@ smartctl=%%PREFIX%%/sbin/smartctl 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` + daily_status_smart_devices=`sysctl -n kern.disks` ;; *) ;; esac @@ -35,6 +35,7 @@ trap "rm -f ${tmpfile}" 0 1 3 15 rc=0 case "${daily_status_smart_enable}" in [Yy][Ee][Ss]) + cd /dev for device in ${daily_status_smart_devices}; do if [ -e ${device} ]; then echo |