diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-02-24 21:48:27 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-02-24 21:48:27 +0100 |
| commit | 53b507e006737667a7b2f16288e88e0d0fccf78b (patch) | |
| tree | b9f6a0ceaa465785faa0fe83dcaa82ad1841f255 | |
| parent | 7a40b1039a0cef3c47c75260f47aba0548c1cdbb (diff) | |
refresh patches
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/0700-init.patch | 8 | ||||
| -rw-r--r-- | debian/patches/0705-crontab.patch | 10 |
3 files changed, 18 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index f398544..fa148fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ipmiutil (3.0.2-1) UNRELEASED; urgency=medium + + * New upstream release. + * Refresh patches: + - debian/patches/0700-init.patch. + - debian/patches/0705-crontab.patch. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 24 Feb 2017 21:19:36 +0100 + ipmiutil (3.0.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/0700-init.patch b/debian/patches/0700-init.patch index d0701e4..be24a2a 100644 --- a/debian/patches/0700-init.patch +++ b/debian/patches/0700-init.patch @@ -85,16 +85,16 @@ Index: trunk/scripts/ipmiutil_wdt # Short-Description: ipmiutil watchdog timer init script # Description: Init script to enable and reset ipmiutil watchdog timer via cron ### END INIT INFO -@@ -33,6 +33,8 @@ wdtlog=/var/log/$name - #tmpcron=/tmp/wdtcron.$$ - # tmpcron2=/tmp/wdtcron2.$$ +@@ -28,6 +28,8 @@ LOCKFILE=/var/lock/subsys/$name + wdtlog=/var/log/$name + wdtsec=150 # default 150 seconds for watchdog timeout (2*60 + 30) +. /lib/lsb/init-functions + start() { echo -n "Starting $prog: " echo -@@ -137,10 +139,13 @@ case "$1" in +@@ -123,10 +125,13 @@ case "$1" in restart) restart ;; diff --git a/debian/patches/0705-crontab.patch b/debian/patches/0705-crontab.patch index 375ddba..f19523e 100644 --- a/debian/patches/0705-crontab.patch +++ b/debian/patches/0705-crontab.patch @@ -8,13 +8,13 @@ Index: trunk/scripts/ipmiutil_wdt =================================================================== --- trunk.orig/scripts/ipmiutil_wdt +++ trunk/scripts/ipmiutil_wdt -@@ -63,7 +63,8 @@ start() { - # RETVAL=$? - # restart the watchdog every 60 seconds via /etc/cron.d - cat - <<%%% >$wdtcron +@@ -51,7 +51,8 @@ start() { + if [ $RETVAL -eq 0 ]; then + # restart the watchdog every 60 seconds via /etc/cron.d + cat - <<%%% >$wdtcron -* * * * * root $prog -r >/dev/null +MAILTO='' +* * * * * root $prog -r > $prog.lastrun 2&>1 %%% # make crond re-read the /etc/cron.d - $crond_sh restart >>$wdtlog + $restart_cron >>$wdtlog |