From 8049f81e166fbd14a17b462ead97b1947c4f39864155fe9cf1189b671144eaf3 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 31 Jan 2016 12:31:27 +0000 Subject: [PATCH] - lm_sensors-3.4.0-sensord-service-extra-args.patch: Allow passing arbitrary extra arguments to sensord. OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=88 --- ...ensors-3.4.0-sensord-service-extra-args.patch | 16 ++++++++++++++++ sensors.changes | 6 ++++++ sensors.spec | 4 +++- sysconfig.sensord | 8 ++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 lm_sensors-3.4.0-sensord-service-extra-args.patch diff --git a/lm_sensors-3.4.0-sensord-service-extra-args.patch b/lm_sensors-3.4.0-sensord-service-extra-args.patch new file mode 100644 index 0000000..9c3bf17 --- /dev/null +++ b/lm_sensors-3.4.0-sensord-service-extra-args.patch @@ -0,0 +1,16 @@ +Allow passing arbitrary extra arguments to sensord. +--- + prog/init/sensord.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/prog/init/sensord.service ++++ b/prog/init/sensord.service +@@ -6,7 +6,7 @@ After=lm_sensors.service + EnvironmentFile=/etc/sysconfig/sensord + Type=forking + PIDFile=/var/run/sensord.pid +-ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon ++ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon $SENSORD_ARGS + + [Install] + WantedBy=multi-user.target diff --git a/sensors.changes b/sensors.changes index 3d042e2..502967d 100644 --- a/sensors.changes +++ b/sensors.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 31 12:30:06 UTC 2016 - jdelvare@suse.com + +- lm_sensors-3.4.0-sensord-service-extra-args.patch: Allow passing + arbitrary extra arguments to sensord. + ------------------------------------------------------------------- Thu Jul 2 10:55:58 CEST 2015 - jdelvare@suse.com diff --git a/sensors.spec b/sensors.spec index d46d278..2fbcc73 100644 --- a/sensors.spec +++ b/sensors.spec @@ -1,7 +1,7 @@ # # spec file for package sensors # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,7 @@ Patch2: lm_sensors-3.0.0-sensord-separate.patch Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch Patch5: lm_sensors-3.4.0-sensors-detect-fix-systemd-path.patch +Patch6: lm_sensors-3.4.0-sensord-service-extra-args.patch ExcludeArch: s390 s390x %{?systemd_requires} @@ -99,6 +100,7 @@ sense to the user. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" diff --git a/sysconfig.sensord b/sysconfig.sensord index c441446..ab75503 100644 --- a/sysconfig.sensord +++ b/sysconfig.sensord @@ -17,3 +17,11 @@ INTERVAL="1m" # for hours. 0 turns off logging. # LOG_INTERVAL="20m" + +## Type: string +## Default: "" +# +# Pass specific sensord(8) options when the service is started via +# systemctl. +# +SENSORD_ARGS=""