diff options
| author | flz <flz@FreeBSD.org> | 2005-11-18 06:04:25 +0800 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2005-11-18 06:04:25 +0800 |
| commit | 418940db84e5a77d6457e87e30c125128bddc9ad (patch) | |
| tree | e02d2e8b03f275a2f078534cc97a3702dfb580bc /sysutils | |
| parent | 5e280c5e0f8b56d0a555583479dcce4e1888483f (diff) | |
| download | freebsd-ports-gnome-418940db84e5a77d6457e87e30c125128bddc9ad.tar.gz freebsd-ports-gnome-418940db84e5a77d6457e87e30c125128bddc9ad.tar.zst freebsd-ports-gnome-418940db84e5a77d6457e87e30c125128bddc9ad.zip | |
- Tweak rcng script to allow alternative location for the configuration file.
PR: ports/83135
Reported by: Jeremy Chadwick <freebsd@jdc.parodius.com>
Fix/Tested by: flz
Approved by: maintainer timeout (3 months)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/smartmontools-devel/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/smartmontools-devel/files/smartd.sh | 6 | ||||
| -rw-r--r-- | sysutils/smartmontools/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/smartmontools/files/smartd.sh | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile index fa9a7ced3640..9b055996ca5a 100644 --- a/sysutils/smartmontools-devel/Makefile +++ b/sysutils/smartmontools-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= smartmontools PORTVERSION= 5.33 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/sysutils/smartmontools-devel/files/smartd.sh b/sysutils/smartmontools-devel/files/smartd.sh index 5da00f01c0f2..3f3731dcb1b6 100644 --- a/sysutils/smartmontools-devel/files/smartd.sh +++ b/sysutils/smartmontools-devel/files/smartd.sh @@ -14,7 +14,6 @@ # DO NOT CHANGE THESE DEFAULT VALUES HERE # smartd_enable="NO" -smartd_flags="" smartd_pidfile="/var/run/smartd.pid" . %%RC_SUBR%% @@ -22,11 +21,14 @@ smartd_pidfile="/var/run/smartd.pid" name="smartd" rcvar=`set_rcvar` command="%%PREFIX%%/sbin/smartd" -required_files="%%PREFIX%%/etc/smartd.conf" load_rc_config $name +: ${smartd_config="%%PREFIX%%/etc/smartd.conf"} +: ${smartd_flags="--configfile=${smartd_config}"} + pidfile="${smartd_pidfile}" +required_files="${smartd_config}" case "${smartd_flags}" in *-p\ *) diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index fa9a7ced3640..9b055996ca5a 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -7,7 +7,7 @@ PORTNAME= smartmontools PORTVERSION= 5.33 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/sysutils/smartmontools/files/smartd.sh b/sysutils/smartmontools/files/smartd.sh index 5da00f01c0f2..3f3731dcb1b6 100644 --- a/sysutils/smartmontools/files/smartd.sh +++ b/sysutils/smartmontools/files/smartd.sh @@ -14,7 +14,6 @@ # DO NOT CHANGE THESE DEFAULT VALUES HERE # smartd_enable="NO" -smartd_flags="" smartd_pidfile="/var/run/smartd.pid" . %%RC_SUBR%% @@ -22,11 +21,14 @@ smartd_pidfile="/var/run/smartd.pid" name="smartd" rcvar=`set_rcvar` command="%%PREFIX%%/sbin/smartd" -required_files="%%PREFIX%%/etc/smartd.conf" load_rc_config $name +: ${smartd_config="%%PREFIX%%/etc/smartd.conf"} +: ${smartd_flags="--configfile=${smartd_config}"} + pidfile="${smartd_pidfile}" +required_files="${smartd_config}" case "${smartd_flags}" in *-p\ *) |