--- watchdog-5.14.orig/debian/changelog +++ watchdog-5.14/debian/changelog @@ -1,3 +1,23 @@ +watchdog (5.14-3) unstable; urgency=medium + + * Updated Danish debconf translation. + * Updated French debconf translation. (Closes: #771273) + * Added Italian debconf translation. (Closes: #771839) + * Added Brazilian Portuguese debconf translation. (Closes: #771950) + * Changed rules file to make sure default file doesn't come back. + + -- Michael Meskes Thu, 04 Dec 2014 11:30:30 +0100 + +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 Tue, 04 Nov 2014 16:30:54 +0100 + watchdog (5.14-1) unstable; urgency=medium * New upstream version. (Closes: #703445, #720501) --- 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 ;; --- 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 ;; --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: Czech \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 " --- watchdog-5.14.orig/debian/po/da.po +++ watchdog-5.14/debian/po/da.po @@ -1,14 +1,14 @@ # Danish translation watchdog. -# Copyright (C) 2011 watchdog & nedenstående oversættere. +# Copyright (C) 2014 watchdog & nedenstående oversættere. # This file is distributed under the same license as the watchdog package. -# Joe Hansen , 2011. +# Joe Hansen , 2011, 2014. # msgid "" msgstr "" "Project-Id-Version: watchdog\n" -"Report-Msgid-Bugs-To: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" -"PO-Revision-Date: 2011-12-04 22:21+0100\n" +"Report-Msgid-Bugs-To: watchdog@packages.debian.org\n" +"POT-Creation-Date: 2014-11-10 03:23+0100\n" +"PO-Revision-Date: 2014-11-26 22:21+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" @@ -30,36 +30,54 @@ "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 "Start wd_keepalive efter stop af watchdog?" #. 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 "" +"Angiv venligst hvorvidt stop af watchdog skal starte wd_keepalive for " +"fortsat at udløse watchdog-enheden. 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 +86,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." - --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: German \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 " --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: Spanish \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 " --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: Finnish \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 " --- watchdog-5.14.orig/debian/po/fr.po +++ watchdog-5.14/debian/po/fr.po @@ -3,19 +3,21 @@ # Relecteurs :Jean-Baka Domelevo-Entfellner , # Christian Perrier , Olivier Trichet # Thomas Huriaux et Frédéric Bothamy +# Christian Perrier , 2014. msgid "" msgstr "" "Project-Id-Version:\n" -"Report-Msgid-Bugs-To: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" -"PO-Revision-Date: 2007-07-11 19:54+0200\n" +"Report-Msgid-Bugs-To: watchdog@packages.debian.org\n" +"POT-Creation-Date: 2014-11-10 03:23+0100\n" +"PO-Revision-Date: 2014-11-24 09:38+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.5\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. Type: boolean #. Description @@ -37,12 +39,30 @@ #. Type: boolean #. Description #: ../templates:3001 +msgid "Start wd_keepalive after stopping watchdog?" +msgstr "Faut-il lancer wd_keepalive après l'arrêt de watchdog ?" + +#. 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 "" +"Veuillez indiquer si wd_keepalive doit être lancé après l'arrêt de watchdog, " +"afin de garder le périphérique watchdog actif. 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 +75,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 " --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: Galician \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 " --- watchdog-5.14.orig/debian/po/it.po +++ watchdog-5.14/debian/po/it.po @@ -0,0 +1,91 @@ +# Italian translation of watchdog debconf messages. +# Copyright (C) 2014 watchdog package copyright holder +# This file is distributed under the same license as the watchdog package. +# Beatrice Torracca , 2014. +msgid "" +msgstr "" +"Project-Id-Version: watchdog\n" +"Report-Msgid-Bugs-To: watchdog@packages.debian.org\n" +"POT-Creation-Date: 2014-11-10 03:23+0100\n" +"PO-Revision-Date: 2014-11-26 08:11+0200\n" +"Last-Translator: Beatrice Torracca \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "Start watchdog at boot time?" +msgstr "Far partire watchdog all'avvio?" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "" +"Please specify whether watchdog should be started as part of the boot " +"process. This can be changed later by editing /etc/default/watchdog." +msgstr "" +"Specificare se watchdog debba essere fatto partire come parte del processo " +"di avvio. Questa impostazione può essere cambiata in un secondo momento " +"modificando /etc/default/watchdog." + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Start wd_keepalive after stopping watchdog?" +msgstr "Far partire wd_keepalive dopo l'arresto di watchdog?" + +#. 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 "" +"Specificare se all'arresto di watchdog debba essere avviato wd_keepalive per " +"continuare a far scattare l'avvio del dispositivo watchdog. Questa " +"impostazione può essere cambiata in un secondo momento modificando " +"/etc/default/watchdog." + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "Restart watchdog on upgrades?" +msgstr "Riavviare watchdog in caso di aggiornamenti?" + +#. 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)." +msgstr "" +"Se il kernel è configurato con l'opzione CONFIG_WATCHDOG_NOWAYOUT (che non è " +"l'impostazione predefinita), il riavvio di watchdog causerà un riavvio " +"spurio (il kernel penserà che il demone watchdog sia andato in crash)." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Watchdog module to preload:" +msgstr "Modulo di watchdog da precaricare:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please choose which watchdog module should be preloaded before starting " +"watchdog. The 'softdog' module should be suited for all installations. Enter " +"'none' if you don't want the script to load a module." +msgstr "" +"Specificare quale modulo di watchdog debba essere precaricato prima dell'avvio " +"di watchdog. Il modulo «softdog» dovrebbe essere adatto per tutte le " +"installazioni. Inserire «none» se non si desidera che lo script carichi un " +"modulo." --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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) \n" "Language-Team: Japanese \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 " --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: debian-l10n-dutch \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 " --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: Portuguese \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 " --- watchdog-5.14.orig/debian/po/pt_BR.po +++ watchdog-5.14/debian/po/pt_BR.po @@ -0,0 +1,91 @@ +# Debconf translations for watchdog. +# Copyright (C) 2014 THE watchdog'S COPYRIGHT HOLDER +# This file is distributed under the same license as the watchdog package. +# Adriano Rafael Gomes , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: watchdog\n" +"Report-Msgid-Bugs-To: watchdog@packages.debian.org\n" +"POT-Creation-Date: 2014-11-10 03:23+0100\n" +"PO-Revision-Date: 2014-11-26 15:54-0200\n" +"Last-Translator: Adriano Rafael Gomes \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "Start watchdog at boot time?" +msgstr "Iniciar o watchdog na inicialização do sistema?" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "" +"Please specify whether watchdog should be started as part of the boot " +"process. This can be changed later by editing /etc/default/watchdog." +msgstr "" +"Por favor, especifique se o watchdog deverá ser iniciado como parte do " +"processo de inicialização do sistema. Isso pode ser alterado mais tarde " +"editando o arquivo /etc/default/watchdog." + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Start wd_keepalive after stopping watchdog?" +msgstr "Iniciar o wd_keepalive depois de parar o watchdog?" + +#. 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 "" +"Por favor, especifique se ao parar o watchdog deve-se iniciar o wd_keepalive " +"para continuar disparando o dispositivo watchdog. Isso pode ser alterado " +"mais tarde editando o arquivo /etc/default/watchdog." + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "Restart watchdog on upgrades?" +msgstr "Reiniciar o watchdog nas atualizações?" + +#. 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)." +msgstr "" +"Se o kernel estiver configurado com a opção CONFIG_WATCHDOG_NOWAYOUT (que " +"não é a configuração padrão), reiniciar o watchdog causará uma " +"reinicialização espúria do sistema (o kernel assumirá que o daemon watchdog " +"travou)." + +#. Type: string +#. Description +#: ../templates:5001 +msgid "Watchdog module to preload:" +msgstr "Módulo watchdog para carregar previamente:" + +#. Type: string +#. Description +#: ../templates:5001 +msgid "" +"Please choose which watchdog module should be preloaded before starting " +"watchdog. The 'softdog' module should be suited for all installations. Enter " +"'none' if you don't want the script to load a module." +msgstr "" +"Por favor, escolha qual módulo watchdog deve ser carregado antes de iniciar " +"o watchdog. O módulo \"softdog\" deveria ser adequado para todas as " +"instalações. Informe \"none\" se você quiser que o script não carregue " +"nenhum módulo." --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: Russian \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 " --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: swedish \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 " --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Project-Id-Version: watchdog\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: LANGUAGE \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 " --- 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: meskes@debian.org\n" -"POT-Creation-Date: 2007-07-16 08:48+0200\n" +"Report-Msgid-Bugs-To: watchdog@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 \n" "Language-Team: Vietnamese \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 " --- 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 ] --- watchdog-5.14.orig/debian/rules +++ watchdog-5.14/debian/rules @@ -25,6 +25,7 @@ dh_clean rm -f $(find . -name "*.P") rm -rf build-stamp *~ debian/*~ configure-stamp + -rm -f debian/watchdog.default binary-indep: checkroot build $(checkdir) --- 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 --- 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 --- 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 ;; --- 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' --- 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; }