diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2009-05-29 12:13:26 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2009-05-29 12:13:26 +0000 |
commit | 30083f567373ccd0feb6a709a96c3f5e9ae2bbe6 (patch) | |
tree | 0e6bf4d57fbd85ec9b98ba5a56aa4b791f91f406 | |
parent | 674348c3c2d3a3e4da5e8cc391b5f6645375f547 (diff) | |
download | ports-30083f567373ccd0feb6a709a96c3f5e9ae2bbe6.tar.gz ports-30083f567373ccd0feb6a709a96c3f5e9ae2bbe6.zip |
Notes
-rw-r--r-- | sysutils/smartmontools-devel/Makefile | 2 | ||||
-rw-r--r-- | sysutils/smartmontools-devel/files/smart.in | 19 | ||||
-rw-r--r-- | sysutils/smartmontools/Makefile | 2 | ||||
-rw-r--r-- | sysutils/smartmontools/files/smart.in | 19 |
4 files changed, 28 insertions, 14 deletions
diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile index b8ceefae82f4..3ef19babc237 100644 --- a/sysutils/smartmontools-devel/Makefile +++ b/sysutils/smartmontools-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= smartmontools PORTVERSION= 5.38 -PORTREVISION= 4 +PORTREVISION= 5 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 166e4bf87187..30db9ab371e6 100644 --- a/sysutils/smartmontools-devel/files/smart.in +++ b/sysutils/smartmontools-devel/files/smart.in @@ -12,12 +12,21 @@ fi 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 @@ trap "rm -f ${tmpfile}" 0 1 3 15 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 diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index b8ceefae82f4..3ef19babc237 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -7,7 +7,7 @@ PORTNAME= smartmontools PORTVERSION= 5.38 -PORTREVISION= 4 +PORTREVISION= 5 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 166e4bf87187..30db9ab371e6 100644 --- a/sysutils/smartmontools/files/smart.in +++ b/sysutils/smartmontools/files/smart.in @@ -12,12 +12,21 @@ fi 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 @@ trap "rm -f ${tmpfile}" 0 1 3 15 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 |