Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package watchdog
This version fixes a couple serious bugs:
- a small upstream patch to fix an incorrectly calculated amount of memory
where a variable wasn't correctly converted
- #767704: prevent /etc/init.d/sendsigs from killing wd_keepalive, because that
may
(depending on the kernel configuration) result in a hard reset before the
shutdown is completed
- #767644: do not ship /etc/default/watchdog as config file, instead it was
supposed to be auto-generated.
- #768168: Fix service file to not create a cycle that prevents watchdog from
being started. At the same time change the service files to be more robust.
debdiff attached.
Thanks.
Michael
unblock watchdog/5.14-2
-- System Information:
Debian Release: jessie/sid
APT prefers testing-updates
APT policy: (500, 'testing-updates'), (500, 'unstable'), (500, 'testing'),
(1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/changelog
+++ watchdog-5.14/debian/changelog
@@ -1,3 +1,13 @@
+watchdog (5.14-2) unstable; urgency=medium
+
+ * Applied upstream change to fix an incorrectly calculated amount of memory
+ being used in a test.
+ * Make sure /etc/init.d/sendsigs does not kill wd_keepalive. (Closes: #767704)
+ * Auto-generated default file from debconf. (Closes: #767644)
+ * Changed ordering of unit files to prevent a cycle. (Closes: #768168)
+
+ -- Michael Meskes <mes...@debian.org> Tue, 04 Nov 2014 16:30:54 +0100
+
watchdog (5.14-1) unstable; urgency=medium
* New upstream version. (Closes: #703445, #720501)
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/config
+++ watchdog-5.14/debian/config
@@ -10,6 +10,11 @@
1) db_set watchdog/run true;;
*) return 1;;
esac
+ case `sed -n 's/^run_wd_keepalive=//p' "$@"` in
+ 0) db_set watchdog/run_keepalive false;;
+ 1) db_set watchdog/run_keepalive true;;
+ *) return 1;;
+ esac
db_set watchdog/module `sed -n 's/^watchdog_module="\(.*\)"/\1/p' "$@"`
}
@@ -41,6 +46,10 @@
db_get watchdog/run
[ "$RET" = false ] || db_input medium watchdog/restart || true
;;
+ 3)
+ db_get watchdog/restart
+ [ "$RET" = false ] || db_input medium watchdog/run_keepalive || true
+ ;;
*)
break
;;
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/init
+++ watchdog-5.14/debian/init
@@ -57,6 +57,9 @@
--pidfile /var/run/$KEEPALIVE_NAME.pid
log_end_msg $?
+ # also remove the sendsigs omit file
+ rm -f /run/sendsigs.omit.d/$KEEPALIVE_NAME.pid
+
# Unconditionally start watchdog daemon because we want to run it even
# if wd_keepalive wasn't running
log_begin_msg "Starting watchdog daemon..."
@@ -80,6 +83,9 @@
start-stop-daemon --start --quiet --pidfile /var/run/$KEEPALIVE_NAME.pid \
--exec $KEEPALIVE_DAEMON -- $watchdog_options
log_end_msg $?
+
+ # and tell sendsigs to ignore it
+ ln -s /var/run/$KEEPALIVE_NAME.pid /run/sendsigs.omit.d/$KEEPALIVE_NAME.pid
fi
fi
;;
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/cs.po
+++ watchdog-5.14/debian/po/cs.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2007-07-07 21:31+0200\n"
"Last-Translator: Miroslav Kure <ku...@debian.cz>\n"
"Language-Team: Czech <debian-l10n-cz...@lists.debian.org>\n"
@@ -35,12 +35,33 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Vyberte si, zda se má watchdog spouštět během zavádění systému. Své "
+"rozhodnutí můžete později změnit úpravou souboru /etc/default/watchdog."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "Restartovat watchdog při aktualizaci?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -52,13 +73,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Modul watchdogu, který se má nahrát:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/da.po
+++ watchdog-5.14/debian/po/da.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2011-12-04 22:21+0100\n"
"Last-Translator: Joe Hansen <joedalt...@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-dan...@lists.debian.org>\n"
@@ -30,36 +30,58 @@
"process. This can be changed later by editing /etc/default/watchdog."
msgstr ""
"Angiv venligst hvorvidt watchdog skal igangsættes som en del af "
-"opstartsprocessen. Dette kan ændres senere ved at redigere "
-"/etc/default/watchdog."
+"opstartsprocessen. Dette kan ændres senere ved at redigere /etc/default/"
+"watchdog."
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Angiv venligst hvorvidt watchdog skal igangsættes som en del af "
+"opstartsprocessen. Dette kan ændres senere ved at redigere /etc/default/"
+"watchdog."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "Genstart watchdog ved opgraderinger?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
"reboot (the kernel will assume that the watchdog daemon crashed)."
msgstr ""
-"Hvis kernen er konfigureret med tilvalget CONFIG_WATCHDOG_NOWAYOUT (som "
-"ikke er standardindstillingen) vil genstart af watchdog medføre en falsk "
-"genstart (kernen vil antage at watchdog-dæmonen brød ned)."
+"Hvis kernen er konfigureret med tilvalget CONFIG_WATCHDOG_NOWAYOUT (som ikke "
+"er standardindstillingen) vil genstart af watchdog medføre en falsk genstart "
+"(kernen vil antage at watchdog-dæmonen brød ned)."
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Watchdog-modul at præindlæse:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
@@ -68,4 +90,3 @@
"Vælg venligst hvilket watchdog-modul der skal præindlæses før start af "
"watchdog. Modulet »softdog« bør være egnet for alle installationer. Indtast "
"»none« (ingen) hvis du ikke ønsker, at skriptet skal indlæse et modul."
-
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/de.po
+++ watchdog-5.14/debian/po/de.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog 5.3.1-3\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2007-07-14 12:58+0200\n"
"Last-Translator: Helge Kreutzmann <deb...@helgefjell.de>\n"
"Language-Team: German <debian-l10n-ger...@lists.debian.org>\n"
@@ -35,12 +35,30 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr "Wd_keepalive nach Beendigung von Watchdog starten?"
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Bitte geben Sie an, ob wd_keepalive beim Beenden von Watchdog gestartet "
+"werden soll, um das Watchdog-Device weiterhin zu beschreiben. Dies kann "
+"später in der Datei /etc/default/watchdog geändert werden."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "Watchdog nach einem Upgrade neu starten?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -53,13 +71,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Watchdog-Modul, das vorgeladen werden soll:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/es.po
+++ watchdog-5.14/debian/po/es.po
@@ -30,8 +30,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog 5.4-5\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2008-08-09 20:18-0500\n"
"Last-Translator: Carlos Eduardo Sotelo Pinto <krlos.a...@gmail.com>\n"
"Language-Team: Spanish <debian-l10n-span...@list.debian.org>\n"
@@ -60,12 +60,34 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Especifique si se debe iniciar watchdog como parte del proceso de carga del "
+"sistema. Puuede cambiar más adelante esto luego editando el archivo /etc/"
+"default/watchdog."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "¿Desea reiniciar «watchdog» en las actualizaciones?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -77,13 +99,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Módulo de watchdog a precargar:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/fi.po
+++ watchdog-5.14/debian/po/fi.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog_5.4-2\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2007-12-22 16:12+0200\n"
"Last-Translator: Esko Arajärvi <e...@iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finn...@lists.debian.org>\n"
@@ -33,12 +33,34 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Valitse tulisiko watchdog käynnistää osana tietokoneen käynnistystä. Tätä "
+"asetusta voidaan muuttaa myöhemmin muokkaamalla tiedostoa /etc/default/"
+"watchdog."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "Käynnistetäänkö watchdog uudelleen päivitysten yhteydessä?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -51,13 +73,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Ennakkoon ladattava watchdog-moduuli:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/fr.po
+++ watchdog-5.14/debian/po/fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version:\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2007-07-11 19:54+0200\n"
"Last-Translator: Christian Perrier <bubu...@debian.org>\n"
"Language-Team: French <debian-l10n-fre...@lists.debian.org>\n"
@@ -37,12 +37,34 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Veuillez indiquer si vous désirez démarrer watchdog à l'amorçage de "
+"l'ordinateur. Vous pourrez changer ce comportement plus tard en modifiant le "
+"fichier /etc/default/watchdog."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "Faut-il redémarrer watchdog lors des mises à jour ?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -55,13 +77,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Module watchdog à précharger :"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/gl.po
+++ watchdog-5.14/debian/po/gl.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2007-07-02 17:48+0200\n"
"Last-Translator: Jacobo Tarrio <jtar...@debian.org>\n"
"Language-Team: Galician <proxe...@trasno.net>\n"
@@ -34,12 +34,33 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Indique se quere que watchdog se inicie coma unha parte do proceso de inicio "
+"do sistema. Isto pódese cambiar máis tarde editando /etc/default/watchdog."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "¿Reiniciar watchdog ao actualizalo?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -51,13 +72,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Módulo de watchdog a precargar:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/ja.po
+++ watchdog-5.14/debian/po/ja.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog 5.4-10\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2009-01-05 22:44+0900\n"
"Last-Translator: Hideki Yamane (Debian-JP) <henr...@debian.or.jp>\n"
"Language-Team: Japanese <debian-japan...@lists.debian.org>\n"
@@ -36,12 +36,33 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"起動プロセスの一部として watchdog を起動させるかどうか指定してください。この"
+"指定は、/etc/default/watchdog を編集して後から変更することも可能です。"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "アップグレード時に watchdog を再起動しますか?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -54,13 +75,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "先にロードしておく watchdog モジュール:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/nl.po
+++ watchdog-5.14/debian/po/nl.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog 5.11-1\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2012-01-27 10:40+0100\n"
"Last-Translator: Jeroen Schot <sc...@a-eskwadraat.nl>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-du...@lists.debian.org>\n"
@@ -37,12 +37,34 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Gelieve aan te geven of watchdog gestart dient te worden tijdens het "
+"opstarten van het systeem. Dit kan later aangepast worden door /etc/default/"
+"watchdog te wijzigen."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "watchdog herstarten bij opwaarderingen?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -55,13 +77,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Voor te laden watchdog-module:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/pt.po
+++ watchdog-5.14/debian/po/pt.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog 5.2.5-2\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2007-07-15 20:54+0100\n"
"Last-Translator: Miguel Figueiredo <el...@debianpt.org>\n"
"Language-Team: Portuguese <tra...@debianpt.org>\n"
@@ -38,12 +38,34 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Especifique se quer que o watchdog arranque com parte do processo de "
+"arranque. Pode no entanto alterar esta opção editando o ficheiro /etc/"
+"default/watchdog."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "Reiniciar o watchdog após actualizações?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -56,13 +78,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Módulo watchdog para pré-carregar:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/ru.po
+++ watchdog-5.14/debian/po/ru.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: 5.3.1-3\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2007-07-08 19:33+0400\n"
"Last-Translator: Yuri Kozlov <kozlo...@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russ...@lists.debian.org>\n"
@@ -38,12 +38,33 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Укажите, нужно ли запускать watchdog в процессе загрузки системы. Это можно "
+"изменить позже отредактировав файл /etc/default/watchdog."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "Перезапустить watchdog при обновлении?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -55,13 +76,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Модули, загружаемые перед watchdog:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/sv.po
+++ watchdog-5.14/debian/po/sv.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2008-11-02 05:27+0100\n"
"Last-Translator: Martin Bagge <brot...@bsnet.se>\n"
"Language-Team: swedish <debian-l10n-swed...@lists.debian.org>\n"
@@ -36,12 +36,33 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Ange om watchdog ska startas vid systemets uppstart. Detta kan ändras senare "
+"genom att redigera /etc/default/watchdog."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "Ska watchdog startas om vid uppgraderingar?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -54,13 +75,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Watchdog-moduler som ska förladdas:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/templates.pot
+++ watchdog-5.14/debian/po/templates.pot
@@ -6,12 +6,13 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Project-Id-Version: watchdog\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -33,13 +34,28 @@
#. Type: boolean
#. Description
#: ../templates:3001
-msgid "Restart watchdog on upgrades?"
+msgid "Start wd_keepalive after stopping watchdog?"
msgstr ""
#. Type: boolean
#. Description
#: ../templates:3001
msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Restart watchdog on upgrades?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
"reboot (the kernel will assume that the watchdog daemon crashed)."
@@ -47,13 +63,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr ""
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/po/vi.po
+++ watchdog-5.14/debian/po/vi.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: watchdog\n"
-"Report-Msgid-Bugs-To: mes...@debian.org\n"
-"POT-Creation-Date: 2007-07-16 08:48+0200\n"
+"Report-Msgid-Bugs-To: watch...@packages.debian.org\n"
+"POT-Creation-Date: 2014-11-10 03:23+0100\n"
"PO-Revision-Date: 2007-07-03 22:57+0930\n"
"Last-Translator: Clytie Siddall <cly...@riverland.net.au>\n"
"Language-Team: Vietnamese <vi...@googlegroups.com>\n"
@@ -36,12 +36,33 @@
#. Type: boolean
#. Description
#: ../templates:3001
+msgid "Start wd_keepalive after stopping watchdog?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please specify whether watchdog should be started as part of the boot "
+#| "process. This can be changed later by editing /etc/default/watchdog."
+msgid ""
+"Please specify whether stopping watchdog should start wd_keepalive to keep "
+"on triggering the watchdog device. This can be changed later by editing /etc/"
+"default/watchdog."
+msgstr ""
+"Hãy xác định có nên khởi chạy watchdog trong tiến trình khởi động hay không. "
+"Vẫn còn có thể sửa đổi sau trong tập tin « /etc/default/watchdog »."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
msgid "Restart watchdog on upgrades?"
msgstr "Khởi chạy lại watchdog khi nâng cấp không?"
#. Type: boolean
#. Description
-#: ../templates:3001
+#: ../templates:4001
msgid ""
"If the kernel is configured with the CONFIG_WATCHDOG_NOWAYOUT option (which "
"is not the default setting), restarting watchdog will cause a spurious "
@@ -53,13 +74,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid "Watchdog module to preload:"
msgstr "Mô-đun watchdog cần nạp sẵn:"
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:5001
msgid ""
"Please choose which watchdog module should be preloaded before starting "
"watchdog. The 'softdog' module should be suited for all installations. Enter "
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/postinst
+++ watchdog-5.14/debian/postinst
@@ -29,6 +29,8 @@
default_format="\
# Start watchdog at boot time? 0 or 1
run_watchdog=%s
+# Start wd_keepalive after stopping watchdog? 0 or 1
+run_wd_keepalive=%s
# Load module before starting watchdog
watchdog_module=%s
# Specify additional watchdog options here (see manpage).
@@ -44,19 +46,26 @@
db_get watchdog/module
module=$RET
+ # Determine whether to start wd_keepalive after stopping watchdog.
+ db_get watchdog/run_keepalive
+ case $RET in
+ false) run_wd_keepalive=0;;
+ *) run_wd_keepalive=1;;
+ esac
+
# Create an up-to-date copy of the default file.
{
# If it already exists, preserve everything except our comment
# and $run_watchdog.
if [ -f /etc/default/watchdog ]
then
- printf "$default_format" '.*' '.*' \
+ printf "$default_format" '.*' '.*' '.*' \
| grep -vxf - /etc/default/watchdog \
| grep -v watchdog_options || true
fi
# Append our comment and the current value.
- printf "$default_format" "$run_watchdog" "\"$module\""
+ printf "$default_format" "$run_watchdog" "$run_wd_keepalive" "\"$module\""
# And finally preserve the watchdog_options setting.
if [ -f /etc/default/watchdog ]
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/templates
+++ watchdog-5.14/debian/templates
@@ -14,6 +14,14 @@
Please specify whether watchdog should be started as part of the boot
process. This can be changed later by editing /etc/default/watchdog.
+Template: watchdog/run_keepalive
+Type: boolean
+Default: true
+_Description: Start wd_keepalive after stopping watchdog?
+ Please specify whether stopping watchdog should start wd_keepalive to keep on
+ triggering the watchdog device. This can be changed later by editing
+ /etc/default/watchdog.
+
Template: watchdog/restart
Type: boolean
Default: false
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/watchdog.service
+++ watchdog-5.14/debian/watchdog.service
@@ -1,15 +1,14 @@
[Unit]
Description=watchdog daemon
-After=systemd-update-utmp.service
-After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target
+Conflicts=wd_keepalive.service
+After=multi-user.target
+OnFailure=wd_keepalive.service
[Service]
Type=forking
EnvironmentFile=/etc/default/watchdog
-ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || echo /sbin/modprobe $watchdog_module'
-ExecStartPre=/bin/systemctl stop wd_keepalive
-ExecStart=/usr/sbin/watchdog $watchdog_options
-ExecStopPost=/bin/systemctl start wd_keepalive
+ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module
+ExecStart=/bin/sh -c '[ $run_watchdog != 1 ] || exec /usr/sbin/watchdog $watchdog_options'
+ExecStopPost=/bin/sh -c '[ $run_wd_keepalive != 1 ] || false'
[Install]
-WantedBy=multi-user.target
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/wd_keepalive.init
+++ watchdog-5.14/debian/wd_keepalive.init
@@ -45,6 +45,10 @@
start-stop-daemon --start --quiet --pidfile /var/run/$KEEPALIVE_NAME.pid \
--exec $KEEPALIVE_DAEMON -- $watchdog_options
log_end_msg $?
+
+ # tell sendsigs to ignore it
+ ln -s /var/run/$KEEPALIVE_NAME.pid /run/sendsigs.omit.d/$KEEPALIVE_NAME.pid
+
fi
;;
@@ -55,6 +59,9 @@
start-stop-daemon --stop --quiet --oknodo --retry $STOP_RETRY_SCHEDULE \
--pidfile /var/run/$KEEPALIVE_NAME.pid
log_end_msg $?
+
+ # remove the sendsigs omit file
+ rm -f /run/sendsigs.omit.d/$KEEPALIVE_NAME.pid
fi
;;
only in patch2:
unchanged:
--- watchdog-5.14.orig/debian/wd_keepalive.service
+++ watchdog-5.14/debian/wd_keepalive.service
@@ -1,10 +1,13 @@
[Unit]
Description=watchdog keepalive daemon
-Before=shutdown.target
-Conflicts=shutdown.target
+Before=watchdog.service shutdown.target
+Conflicts=watchdog.service shutdown.target
[Service]
Type=forking
EnvironmentFile=/etc/default/watchdog
-ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || echo /sbin/modprobe $watchdog_module'
+ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module'
+ExecStartPre=-/bin/systemctl reset-failed watchdog.service
ExecStart=/usr/sbin/wd_keepalive $watchdog_options
+ExecStartPost=/bin/sh -c 'ln -s /var/run/wd_keepalive.pid /run/sendsigs.omit.d/wd_keepalive.pid'
+ExecStopPost=/bin/sh -c 'rm -f /run/sendsigs.omit.d/wd_keepalive.pid'
only in patch2:
unchanged:
--- watchdog-5.14.orig/src/memory.c
+++ watchdog-5.14/src/memory.c
@@ -115,7 +115,7 @@
}
/*
- * Close the special memor data file (if open).
+ * Close the special memory data file (if open).
*/
int close_memcheck(void)
@@ -134,6 +134,7 @@
{
int i;
char *mem;
+ size_t len = EXEC_PAGESIZE * (size_t)minalloc;
if (minalloc <= 0)
return 0;
@@ -141,15 +142,15 @@
/*
* Map and fault in the pages
*/
- mem = mmap(NULL, EXEC_PAGESIZE * minalloc, PROT_READ | PROT_WRITE,
+ mem = mmap(NULL, len, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, 0, 0);
if (mem == MAP_FAILED) {
i = errno;
- log_message(LOG_ALERT, "cannot allocate %d bytes (errno = %d)",
- EXEC_PAGESIZE * minalloc, i);
+ log_message(LOG_ALERT, "cannot allocate %lu bytes (errno = %d = '%s')",
+ (unsigned long)len, i, strerror(i));
return i;
}
- munmap(mem, EXEC_PAGESIZE * minalloc);
+ munmap(mem, len);
return 0;
}
