Attachment 205951 Details for Bug 237974 – dhcdbd-2.2-initscript.patch

[patch] dhcdbd-2.2-initscript.patch

dhcdbd-2.2-initscript.patch (text/plain), 5.07 KB, created by David Cantrell on 2007-09-25 19:36:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Cantrell

Created: 2007-09-25 19:36:55 UTC

Size: 5.07 KB

patch

obsolete

>diff -up dhcdbd-2.2/dhcdbd.init.orig dhcdbd-2.2/dhcdbd.init
>--- dhcdbd-2.2/dhcdbd.init.orig	2006-11-01 11:01:56.000000000 -0500
>+++ dhcdbd-2.2/dhcdbd.init	2007-09-25 15:32:00.000000000 -0400
>@@ -1,32 +1,58 @@
>-#!/bin/bash
>+#!/bin/sh
> #
>-#  dhcdbd  :  DHcp Client D-Bus Daemon
>+### BEGIN INIT INFO
>+# Provides: dhcdbd
>+# Default-Start: 2 3 4 5
>+# Default-Stop: 0 1 6
>+# Should-Start: $network
>+# Required-Start:
>+# Required-Stop:
>+# Short-Description: Start and stop the DHCP D-Bus daemon
>+# Description: dhcdbd provides D-BUS control of the ISC DHCP client,
>+#              dhclient, and D-BUS access to the DHCP options obtained by
>+#              dhclient for each IPv4 interface.  dhcdbd shuts down
>+#              automatically when the messagebus is shut down.
>+### END INIT INFO
> #
>-#  chkconfig: - 97 02
>-#  description: dhcdbd provides D-BUS control of the ISC DHCP client, \
>-#               dhclient, and D-BUS access to the DHCP options obtained by \
>-#               dhclient for each IPv4 interface .
>-#  processname: dhcdbd
>+# The fields below are left around for legacy tools (will remove later).
> #
>-#  dhcdbd shuts down automatically when the messagebus is shut down .
>-#
>-. /etc/rc.d/init.d/functions
>-[ -e /etc/sysconfig/network ] && . /etc/sysconfig/network
>-[ "${NETWORKING}" = "no" ] && exit 0
>+# chkconfig: 2345 97 02
>+# description: dhcdbd provides D-BUS control of the ISC DHCP client, \
>+#              dhclient, and D-BUS access to the DHCP options obtained by \
>+#              dhclient for each IPv4 interface.  dhcdbd shuts down \
>+#              automatically when the messagebus is shut down.
>+# processname: dhcdbd
>+
>+. /etc/init.d/functions
>+
>+RETVAL=0
>+
> prog=dhcdbd
>+dhcdbd=/sbin/dhcdbd
>+lockfile=/var/lock/subsys/dhcdbd
>+busfile=/var/run/dbus/system_bus_socket
> 
> start() {
>+    pidofproc $prog >/dev/null 2>&1
>+    RETVAL=$?
>+    [ $RETVAL -eq 0 ] && return $RETVAL
>+
>     echo -n $"Starting $prog:"
>-    daemon /sbin/dhcdbd --system 
>+    daemon $dhcdbd --system
>     RETVAL=$?
>     echo
>-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcdbd
>-    return $RETVAL;
>+    return $RETVAL
> }
> 
> stop () {
>+    pidofproc $prog >/dev/null 2>&1
>+    if [ $? -eq 0 ]; then
>+        RETVAL=7
>+        return $RETVAL
>+    fi
>+
>     echo -n $"Stopping $prog:"
>-    if [ -e /var/lock/subsys/dhcdbd ] && [ -e /var/run/dbus/system_bus_socket ]; then
>+    if [ -e $lockfile ] && [ -e $busfile ]; then
>         /bin/dbus-send --system \
>                         --dest=com.redhat.dhcp \
>                         --type=method_call \
>@@ -35,74 +61,64 @@ stop () {
>                         /com/redhat/dhcp \
>                         com.redhat.dhcp.quit >/dev/null 2>&1
>         RETVAL=$?
>-    else 
>-        killproc dhcdbd -TERM
>+    else
>+        killproc $dhcdbd -TERM
>         RETVAL=$?
>-    fi;
>-    rm -f /var/lock/subsys/dhcdbd
>-    if [ $RETVAL -eq 0 ]; then
>-        success;
>-        echo;
>+    fi
>+
>+    if [ $RETVAL = 0 ]; then
>+        success
>+        echo
>     else
>-        failure;
>-        echo;
>-    fi;
>-}
>+        failure
>+        echo
>+    fi
> 
>-status() {
>-    [ ! -f /var/run/dhcdbd.pid ] && return 0
>-    pid=`cat /var/run/dhcdbd.pid`;
>-    RETVAL=$?
>-    if [ "$RETVAL" -eq 0 ] && [ -n "$pid" ]; then
>-        sender=`/bin/dbus-send --system \
>-                               --dest=com.redhat.dhcp \
>-                               --type=method_call \
>-                               --print-reply \
>-                               --reply-timeout=20000 \
>-                               /com/redhat/dhcp \
>-                               com.redhat.dhcp.ping |
>-                grep 'sender=' | sed 's/^.*sender=//;s/\ .*$//'`;
>-        RETVAL=$?
>-        if [ "$RETVAL" -eq 0 ]; then
>-            echo -n $"$prog ( $pid ) listening on $sender"
>-            success;
>-            echo;
>-        else
>-            failure;
>-            echo;
>-        fi;
>-    fi;
>-    return $RETVAL;
>+    rm -f $lockfile
>+    return $RETVAL
> }
> 
>+if [ ! -x $dhcdbd ]; then
>+    RETVAL=5
>+    exit $RETVAL
>+fi
>+
>+if [ $# -gt 1 ]; then
>+    RETVAL=2
>+    exit $RETVAL
>+fi
>+
> case "$1" in
>-    start) 
>-        start;
>-        RETVAL=$?;
>+    start)
>+        start
>+        RETVAL=$?
>         ;;
>     stop)
>-        stop;
>-        RETVAL=$?;
>+        stop
>+        RETVAL=$?
>+        ;;
>+    restart)
>+        stop && start
>+        RETVAL=$?
>+        ;;
>+    try-restart)
>+        RETVAL=3
>         ;;
>-    condrestart)
>-        if [ -e /var/lock/subsys/dhcdbd ] && [ -e /var/run/dhcdbd.pid ] && [ -e /proc/`cat /var/run/dhcdbd.pid` ]; then
>-            stop;
>-            start;
>-            RETVAL=$?;
>-        fi;
>-        ;;
>-    restart|reload)
>-        stop;
>-        start;
>-        RETVAL=$?;
>+    reload)
>+        RETVAL=3
>+        ;;
>+    force-reload)
>+        stop && start
>+        RETVAL=$?
>         ;;
>     status)
>-        status;
>-        RETVAL=$?;
>+        status $dhcdbd
>+        RETVAL=$?
>         ;;
>     *)
>-        echo $"$prog: Usage: < start | stop | restart | reload | status >"
>+        echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}"
>+        RETVAL=3
>         ;;
> esac;
> 
>-exit $RETVAL;
>+exit $RETVAL

Actions: View | Diff

Attachments on bug 237974: 205951