diff options
Diffstat (limited to 'debian/patches/005-init.patch')
| -rw-r--r-- | debian/patches/005-init.patch | 183 |
1 files changed, 161 insertions, 22 deletions
diff --git a/debian/patches/005-init.patch b/debian/patches/005-init.patch index d6131e4..938b511 100644 --- a/debian/patches/005-init.patch +++ b/debian/patches/005-init.patch @@ -5,29 +5,48 @@ Last-Update: 2014-08-09 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/scripts/ipmi_port.sh =================================================================== ---- trunk.orig/scripts/ipmi_port.sh 2014-08-09 11:00:23.096102828 +0200 -+++ trunk/scripts/ipmi_port.sh 2014-08-09 11:00:40.716468044 +0200 -@@ -25,6 +25,7 @@ - #. /etc/init.d/functions - #fi - -+ - name=ipmi_port - progdir=/usr/sbin - prog="$progdir/$name" -@@ -46,6 +47,8 @@ - echo $p - } +--- trunk.orig/scripts/ipmi_port.sh 2014-08-10 13:32:43.716552784 +0200 ++++ trunk/scripts/ipmi_port.sh 2014-08-10 13:32:43.292544281 +0200 +@@ -14,8 +14,8 @@ + # Provides: ipmi_port + # Required-Start: $local_fs $network $remote_fs + # Required-Stop: $local_fs $network $remote_fs +-# Default-Start: 3 4 5 3 4 5 +-# Default-Stop: 0 1 2 6 0 1 2 6 ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # Short-Description: ipmi_port reserves the RMCP port from portmap + # Description: ipmi_port is used to reserve the RMCP port from portmap + ### END INIT INFO +@@ -40,6 +40,8 @@ + # This threshold script could be created by ipmiutil sensor -p ... + thresh="${vardir}/thresholds.sh" +. /lib/lsb/init-functions + - start() - { - echo -n $"Starting $name: " + getpid () { + # This is messy if the parent script is same name as $1 + p=`ps -ef |grep "$1" |grep -v grep |awk '{print $2}'` +@@ -184,4 +186,3 @@ + esac + + exit $? +- Index: trunk/scripts/ipmiutil_asy =================================================================== ---- trunk.orig/scripts/ipmiutil_asy 2014-08-09 11:00:23.096102828 +0200 -+++ trunk/scripts/ipmiutil_asy 2014-08-09 11:00:23.088102663 +0200 +--- trunk.orig/scripts/ipmiutil_asy 2014-08-10 13:32:43.716552784 +0200 ++++ trunk/scripts/ipmiutil_asy 2014-08-10 13:32:43.292544281 +0200 +@@ -13,8 +13,8 @@ + # Provides: ipmiutil_asy + # Required-Start: $local_fs $remote_fs $syslog + # Required-Stop: $local_fs $remote_fs $syslog +-# Default-Start: 3 4 5 3 4 5 +-# Default-Stop: 0 1 2 6 0 1 2 6 ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # 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 @@ echo $p } @@ -37,10 +56,26 @@ Index: trunk/scripts/ipmiutil_asy start() { echo -n $"Starting $dname: " +@@ -152,4 +154,3 @@ + exit 2 + esac + exit $? +- Index: trunk/scripts/ipmiutil_wdt =================================================================== ---- trunk.orig/scripts/ipmiutil_wdt 2014-08-09 11:00:23.096102828 +0200 -+++ trunk/scripts/ipmiutil_wdt 2014-08-09 11:00:23.088102663 +0200 +--- trunk.orig/scripts/ipmiutil_wdt 2014-08-10 13:32:43.716552784 +0200 ++++ trunk/scripts/ipmiutil_wdt 2014-08-10 13:32:43.296544361 +0200 +@@ -14,8 +14,8 @@ + # Provides: ipmiutil_wdt + # Required-Start: $local_fs $remote_fs $syslog + # Required-Stop: $local_fs $remote_fs $syslog +-# Default-Start: 3 4 5 3 4 5 +-# Default-Stop: 0 1 2 6 0 1 2 6 ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # 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 @@ #tmpcron=/tmp/wdtcron.$$ # tmpcron2=/tmp/wdtcron2.$$ @@ -67,8 +102,19 @@ Index: trunk/scripts/ipmiutil_wdt esac Index: trunk/scripts/ipmiutil_evt =================================================================== ---- trunk.orig/scripts/ipmiutil_evt 2014-08-09 11:00:23.096102828 +0200 -+++ trunk/scripts/ipmiutil_evt 2014-08-09 11:00:23.092102746 +0200 +--- trunk.orig/scripts/ipmiutil_evt 2014-08-10 13:32:43.716552784 +0200 ++++ trunk/scripts/ipmiutil_evt 2014-08-10 13:32:43.296544361 +0200 +@@ -15,8 +15,8 @@ + # Provides: ipmiutil_evt + # Required-Start: $local_fs $remote_fs $syslog + # Required-Stop: $local_fs $remote_fs $syslog +-# Default-Start: 3 4 5 3 4 5 +-# Default-Stop: 0 1 2 6 0 1 2 6 ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # Short-Description: ipmiutil event monitoring init script + # Description: Init script starts ipmiutil event monitoring service + ### END INIT INFO @@ -40,6 +40,8 @@ echo $p } @@ -78,3 +124,96 @@ Index: trunk/scripts/ipmiutil_evt start() { echo -n $"Starting $name: " +@@ -155,4 +157,3 @@ + exit 2 + esac + exit $? +- +Index: trunk/configure.ac +=================================================================== +--- trunk.orig/configure.ac 2014-08-10 13:32:43.716552784 +0200 ++++ trunk/configure.ac 2014-08-10 13:32:43.296544361 +0200 +@@ -326,11 +326,11 @@ + MD2_CFLAGS="-DSKIP_MD2" + init0=/etc/rc.d/init.d + fi +- if test $isredhat -eq 0 ; then ++# if test $isredhat -eq 0 ; then + # set default start/stop for init scripts +- sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts +- sed -i 's/# Default-Stop:/# Default-Stop: 0 1 2 6/' $init_scripts +- fi ++# sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts ++# sed -i 's/# Default-Stop:/# Default-Stop: 0 1 2 6/' $init_scripts ++# fi + if test -f "$LIB_DIR/libcrypto.so"; then + strings $LIB_DIR/libcrypto.so | grep EVP_md2 >/dev/null 2>&1 + if test $? -ne 0; then +Index: trunk/scripts/ipmi_info +=================================================================== +--- trunk.orig/scripts/ipmi_info 2014-08-10 13:32:43.716552784 +0200 ++++ trunk/scripts/ipmi_info 2014-08-10 13:32:43.296544361 +0200 +@@ -11,8 +11,8 @@ + # Provides: ipmi_info + # Required-Start: $local_fs $network $remote_fs + # Required-Stop: $local_fs $network $remote_fs +-# Default-Start: +-# Default-Stop: ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # Short-Description: ipmi_info saves OS info to the IPMI system info + # Description: ipmi_info saves OS info to the IPMI system info + ### END INIT INFO +@@ -21,6 +21,8 @@ + iuprog=/usr/bin/ipmiutil + tmp=/tmp/ipmi_info.tmp + ++. /lib/lsb/init-functions ++ + getosver() { + if [ -f /etc/os-release ]; then + . /etc/os-release +@@ -121,4 +123,3 @@ + esac + + exit $? +- +Index: trunk/scripts/ipmiutil_asy.service +=================================================================== +--- trunk.orig/scripts/ipmiutil_asy.service 2014-08-10 13:32:43.716552784 +0200 ++++ trunk/scripts/ipmiutil_asy.service 2014-08-10 13:32:43.296544361 +0200 +@@ -11,4 +11,3 @@ + + [Install] + WantedBy=multi-user.target +- +Index: trunk/scripts/ipmiutil_evt.service +=================================================================== +--- trunk.orig/scripts/ipmiutil_evt.service 2014-08-10 13:32:43.716552784 +0200 ++++ trunk/scripts/ipmiutil_evt.service 2014-08-10 13:32:43.296544361 +0200 +@@ -11,5 +11,3 @@ + + [Install] + WantedBy=multi-user.target +- +- +Index: trunk/scripts/ipmiutil_wdt.service +=================================================================== +--- trunk.orig/scripts/ipmiutil_wdt.service 2014-08-10 13:32:43.716552784 +0200 ++++ trunk/scripts/ipmiutil_wdt.service 2014-08-10 13:32:43.708552623 +0200 +@@ -10,5 +10,3 @@ + + [Install] + WantedBy=multi-user.target +- +- +Index: trunk/scripts/ipmi_port.service +=================================================================== +--- trunk.orig/scripts/ipmi_port.service 2013-07-11 17:08:38.000000000 +0200 ++++ trunk/scripts/ipmi_port.service 2014-08-10 13:33:22.773336083 +0200 +@@ -11,5 +11,3 @@ + + [Install] + WantedBy=multi-user.target +- +- |