summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-04-20 13:10:59 -0400
committerMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-04-20 13:10:59 -0400
commit241c0a9db64e7ae0faf16534951015ba35bfec94 (patch)
tree708666f844f5ed87d964c74bf01edb39cfe4e578
parent41ec33b6dcfc5e75c3676d52775003a8a214ca55 (diff)
downloadthird_party-cobbler-241c0a9db64e7ae0faf16534951015ba35bfec94.tar.gz
third_party-cobbler-241c0a9db64e7ae0faf16534951015ba35bfec94.tar.xz
third_party-cobbler-241c0a9db64e7ae0faf16534951015ba35bfec94.zip
Update specfile/changelog
-rw-r--r--CHANGELOG1
-rw-r--r--cobbler.spec2
-rwxr-xr-xconfig/cobblerd26
3 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG b/CHANGELOG
index cf983ca..a206959 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ Cobbler CHANGELOG
- Implemented triggers for add/delete commands
- BootAPI and Config object classes are now Borg patterned to prevent duplication of config info from the API.
- cobbler_syslogd -> cobblerd, now has XMLRPC component for koan >= 0.2.9 clients. Old clients still work.
+- Make cobbler_import work for Centos 5
* Thu Apr 05 2007 - 0.4.6
- Bind cobbler_syslogd to all addresses
diff --git a/cobbler.spec b/cobbler.spec
index c7bd99c..678f670 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -119,7 +119,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%doc AUTHORS CHANGELOG NEWS README COPYING
%changelog
-* Tue Apr 10 2007 Michael DeHaan <mdehaan@redhat.com> - 0.4.7-3
+* Fri Apr 20 2007 Michael DeHaan <mdehaan@redhat.com> - 0.4.7-4
- Upstream changes (see CHANGELOG)
- Added triggers to /var/lib/cobbler/triggers
diff --git a/config/cobblerd b/config/cobblerd
index 756fa00..dd16a33 100755
--- a/config/cobblerd
+++ b/config/cobblerd
@@ -1,15 +1,15 @@
#!/bin/sh
#
-# cobblersyslogd Cobbler kickstart status monitor
+# cobblerd Cobbler helper daemon
#
# chkconfig: 345 99 99
# description: This is a daemon that provides remote cobbler info to koan
-# clients and also logs installer syslog activitity.
+# clients and also logs installer yslog activitity.
#
-# processname: /usr/bin/cobbler_syslogd
+# processname: /usr/bin/cobblerd
# Sanity checks.
-[ -x /usr/bin/cobbler_syslogd ] || exit 0
+[ -x /usr/bin/cobblerd ] || exit 0
# Source function library.
. /etc/rc.d/init.d/functions
@@ -18,41 +18,41 @@ RETVAL=0
start() {
echo -n $"Starting cobbler daemon: "
- if test -f /var/lock/subsys/cobblersyslogd ; then
+ if test -f /var/lock/subsys/cobblerd ; then
echo_failure
echo
return 1
fi
- /usr/bin/cobbler_syslogd
+ /usr/bin/cobblerd
RETVAL=$?
echo_success
echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cobblersyslogd
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cobblerd
return $RETVAL
}
stop() {
echo -n $"Stopping cobbler daemon: "
- if ! test -f /var/lock/subsys/cobblersyslogd ; then
+ if ! test -f /var/lock/subsys/cobblerd ; then
echo_failure
echo
return 1
fi
- pkill cobbler_syslogd
+ pkill cobblerd
RETVAL=$?
- rm /var/lock/subsys/cobblersyslogd
+ rm /var/lock/subsys/cobblerd
echo_success
echo
return $RETVAL
}
mystatus() {
- if test -f /var/lock/subsys/cobblersyslogd ; then
+ if test -f /var/lock/subsys/cobblerd ; then
echo "cobbblerd is running..."
return 0
fi
- echo "cobbler_syslogd is stopped"
+ echo "cobblerd is stopped"
echo
return 0
}
@@ -74,7 +74,7 @@ case "$1" in
start
;;
condrestart)
- if [ -f /var/lock/subsys/cobblersyslogd ]; then
+ if [ -f /var/lock/subsys/cobblerd ]; then
stop
start
fi