3 files changed, 16 insertions, 3 deletions

diff --git a/meta-oe/recipes-extended/smartmontools/files/initd.smartd b/meta-oe/recipes-extended/smartmontools/files/initd.smartd
index 29c27e475..54adcb406 100755
--- a/meta-oe/recipes-extended/smartmontools/files/initd.smartd
+++ b/meta-oe/recipes-extended/smartmontools/files/initd.smartd
@@ -16,8 +16,8 @@
 # Should-Start:               sendmail
 # Required-Stop:              $syslog $remote_fs
 # Should-Stop:                sendmail
-# Default-Start:              
-# Default-Stop:               0 1 2 3 4 5 6
+# Default-Start:              2 3 4 5
+# Default-Stop:               0 1 6
 # Short-Description:          Monitors disk and tape health via S.M.A.R.T.
 # Description:                Start S.M.A.R.T. disk and tape monitor.
 ### END INIT INFO
@@ -52,6 +52,10 @@ smartd_opts="--pidfile $SMARTDPID $smartd_opts"
 
 case "$1" in
         start)
+                if [ "$start_smartd" != "yes" ]; then
+                        [ "$VERBOSE" != "no" ] && echo "Not starting S.M.A.R.T. daemon smartd, disabled via /etc/default/smartmontools"
+                        exit 0
+                fi
                 echo -n "Starting S.M.A.R.T. daemon: smartd"
                 if start-stop-daemon --start --quiet --pidfile $SMARTDPID \
                         --exec $SMARTD_BIN -- $smartd_opts; then
diff --git a/meta-oe/recipes-extended/smartmontools/files/smartmontools.default b/meta-oe/recipes-extended/smartmontools/files/smartmontools.default
new file mode 100644
index 000000000..602e00beb
--- /dev/null
+++ b/meta-oe/recipes-extended/smartmontools/files/smartmontools.default
@@ -0,0 +1,6 @@
+# uncomment to start smartd on system startup for SysV init script
+# For systemd service file, use `systemctl enable smartd'.
+#start_smartd=yes
+
+# uncomment to pass additional options to smartd on startup
+#smartd_opts="--interval=1800"
diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb
index 9b9454c88..b64b96191 100644
--- a/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb
+++ b/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb
@@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \
            file://initd.smartd \
+           file://smartmontools.default \
           "
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \
@@ -31,9 +32,11 @@ do_install_append () {
         #install the init.d/smartd
         install -d ${D}${sysconfdir}/init.d
         install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd
+        install -d ${D}${sysconfdir}/default
+        install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools
 }
 
 INITSCRIPT_NAME = "smartd"
-INITSCRIPT_PARAMS = "start 60 . stop 60 0 1 2 3 4 5 6 ."
+INITSCRIPT_PARAMS = "start 60 2 3 4 5 . stop 60 0 1 6 ."
 
 RDEPENDS_${PN} += "mailx"