[packages/watchdog] - up to 5.15; drop patch enabling defaults that are compiled into binary
arekm
arekm at pld-linux.org
Tue May 17 21:19:58 CEST 2016
commit af5107776f86d29146dc8501fe6a118cf6f49701
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue May 17 21:19:52 2016 +0200
- up to 5.15; drop patch enabling defaults that are compiled into binary
watchdog-config.patch | 23 +++++------------------
watchdog.spec | 6 +++---
2 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/watchdog.spec b/watchdog.spec
index 00b24d4..95d674a 100644
--- a/watchdog.spec
+++ b/watchdog.spec
@@ -8,12 +8,12 @@
Summary: A software watchdog
Summary(pl.UTF-8): Programowy strażnik
Name: watchdog
-Version: 5.14
+Version: 5.15
Release: 1
License: GPL
Group: Daemons
Source0: ftp://ftp.debian.org/debian/pool/main/w/watchdog/%{name}_%{version}.orig.tar.gz
-# Source0-md5: 6d1053323a06d6b5c11bec8076b920d7
+# Source0-md5: 678c32f6f35a0492c9c1b76b4aa88828
Source1: %{name}.init
Source2: %{name}.sysconfig
Patch0: %{name}-foreground.patch
@@ -38,7 +38,7 @@ maszyna się zrebootuje. Każdy zapis opóźnia reboot o minutę. Możliwość
rebootu zależy od stanu maszyny i przerwań.
%prep
-%setup -q -n %{name}-%{version}.orig
+%setup -q
#%patch0 -p1
%patch1 -p1
diff --git a/watchdog-config.patch b/watchdog-config.patch
index 9e8ae34..fda47af 100644
--- a/watchdog-config.patch
+++ b/watchdog-config.patch
@@ -9,26 +9,13 @@
#allocatable-memory = 1
#repair-binary = /usr/sbin/repair
-@@ -21,17 +21,17 @@
- #test-binary =
- #test-timeout =
+@@ -28,7 +28,7 @@ min-memory = 1
+ #retry-timeout = 60
+ #repair-maximum = 1
-#watchdog-device = /dev/watchdog
+watchdog-device = /dev/watchdog
# Defaults compiled into the binary
- #temperature-device =
- #max-temperature = 120
-
- # Defaults compiled into the binary
--#admin = root
--#interval = 1
--#logtick = 1
--#log-dir = /var/log/watchdog
-+admin = root
-+interval = 1
-+logtick = 1
-+log-dir = /var/log/watchdog
-
- # This greatly decreases the chance that watchdog won't be scheduled before
- # your machine is really loaded
+ #temperature-sensor =
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/watchdog.git/commitdiff/af5107776f86d29146dc8501fe6a118cf6f49701
More information about the pld-cvs-commit
mailing list