2 files changed, 1 insertions, 93 deletions
diff --git a/scripts/cobbler_syslogd b/scripts/cobblerd
index 86e77e1..409f738 100755
--- a/scripts/cobbler_syslogd
+++ b/scripts/cobblerd
@@ -16,7 +16,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 import sys
 import os
-import cobbler.syslog_watcher as app
+import cobbler.cobblerd as app
 
 if __name__ == "__main__":
 
diff --git a/scripts/cobblersyslogd b/scripts/cobblersyslogd
deleted file mode 100755
index b8bc3f7..0000000
--- a/scripts/cobblersyslogd
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# cobblersyslogd    Cobbler kickstart status monitor
-#
-# chkconfig: 345 99 99 
-# description:  This is a daemon which monitors and logs remote syslog traffic \
-#               from machines being provisioned from cobbler.  \
-#               See http://cobbler.et.redhat.com
-#
-# processname: /usr/bin/cobbler_syslogd
-
-# Sanity checks.
-[ -x /usr/bin/cobbler_syslogd ] || exit 0
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-RETVAL=0
-
-start() {
-    echo -n $"Starting cobbler remote syslog monitor: "
-    if test -f /var/lock/subsys/cobblersyslogd ; then
-        echo_failure
-        echo
-        return 1
-    fi
-    /usr/bin/cobbler_syslogd
-    RETVAL=$?
-    echo_success
-    echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cobblersyslogd
-    return $RETVAL
-}
-
-
-stop() {
-    echo -n $"Stopping cobbler remote syslog monitor: "
-    if ! test -f /var/lock/subsys/cobblersyslogd ; then
-        echo_failure
-        echo
-        return 1
-    fi
-    pkill cobbler_syslogd
-    RETVAL=$?
-    rm /var/lock/subsys/cobblersyslogd
-    echo_success
-    echo
-    return $RETVAL
-}
-
-mystatus() {
-    if test -f /var/lock/subsys/cobblersyslogd ; then
-        echo "cobbbler_syslogd is running..."
-        return 0
-    fi
-    echo "cobbler_syslogd is stopped"
-    echo
-    return 0
-}
-
-# See how we were called.
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    status)
-        mystatus
-        RETVAL=$?
-        ;;
-    restart)
-        stop
-        start
-        ;;
-    condrestart)
-        if [ -f /var/lock/subsys/cobblersyslogd ]; then
-            stop
-            start
-        fi
-        ;;
-    reload)
-        echo "can't reload configuration, you have to restart it"
-        RETVAL=$?
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
-        ;;
-esac
-exit $RETVAL
-