From f698b47a0cea5deabce1e3c990ac76f2ff0d6d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Oct 2022 14:44:06 +0200 Subject: Fix insert of /lib/lsb/init-functions --- debian/patches/0700-init.patch | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'debian/patches/0700-init.patch') diff --git a/debian/patches/0700-init.patch b/debian/patches/0700-init.patch index 64993d8..e1f8b81 100644 --- a/debian/patches/0700-init.patch +++ b/debian/patches/0700-init.patch @@ -56,15 +56,15 @@ Index: trunk/scripts/ipmiutil_asy # Short-Description: ipmiutil async bridge agent init script # Description: Init script starts ipmiutil async bridge agent for remote reset ### END INIT INFO -@@ -37,6 +37,8 @@ getpid () { - echo $p - } +@@ -25,6 +25,8 @@ + #. /etc/init.d/functions + #fi +. /lib/lsb/init-functions + - start() - { - echo -n "Starting $dname: " + name="ipmiutil_asy" + dname="ipmiutil_asy bridge agent" + getevtlog=/var/log/${name}.log @@ -152,4 +154,3 @@ case "$1" in exit 2 esac @@ -74,7 +74,7 @@ Index: trunk/scripts/ipmiutil_wdt =================================================================== --- trunk.orig/scripts/ipmiutil_wdt +++ trunk/scripts/ipmiutil_wdt -@@ -14,8 +14,8 @@ +@@ -14,13 +14,15 @@ # Provides: ipmiutil_wdt # Required-Start: $local_fs $remote_fs $syslog # Required-Stop: $local_fs $remote_fs $syslog @@ -85,15 +85,13 @@ 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 -@@ -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 + name=ipmiutil_wdt + prog="/usr/bin/ipmiutil wdt" + wdtcron=/etc/cron.d/wdt @@ -123,10 +125,13 @@ case "$1" in restart) restart @@ -124,16 +122,24 @@ Index: trunk/scripts/ipmiutil_evt # Short-Description: ipmiutil event monitoring init script # Description: Init script starts ipmiutil event monitoring service ### END INIT INFO -@@ -40,6 +40,8 @@ getpid () { +@@ -27,6 +27,8 @@ + #. /etc/init.d/functions + #fi + ++. /lib/lsb/init-functions ++ + name="ipmiutil_evt" + getevtlog=/var/log/$name.log + lockfile=/var/lock/subsys/$name +@@ -40,6 +42,7 @@ getpid () { echo $p } -+. /lib/lsb/init-functions + start() { echo -n "Starting $name: " -@@ -155,4 +157,3 @@ case "$1" in +@@ -155,4 +158,3 @@ case "$1" in exit 2 esac exit $? @@ -210,7 +216,7 @@ Index: trunk/configure.ac =================================================================== --- trunk.orig/configure.ac +++ trunk/configure.ac -@@ -410,11 +410,11 @@ else +@@ -421,11 +421,11 @@ else MD2_CFLAGS="-DSKIP_MD2" init0=/etc/rc.d/init.d fi -- cgit v1.2.3 From d9ec0b2fdd01ba9d7fa08c0ecf97552a74f7a6e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Oct 2022 14:46:12 +0200 Subject: Fix DEB-3 header --- debian/patches/0700-init.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/patches/0700-init.patch') diff --git a/debian/patches/0700-init.patch b/debian/patches/0700-init.patch index e1f8b81..506d4f4 100644 --- a/debian/patches/0700-init.patch +++ b/debian/patches/0700-init.patch @@ -1,6 +1,6 @@ Description: include lsb/init-functions -Author: Jörg Frings-Fürst -Last-Update: 2014-08-09 +Author: Jörg Frings-Fürst +Last-Update: 2022-10-02 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/scripts/ipmi_port.sh -- cgit v1.2.3