diff options
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | cobbler.spec | 32 | ||||
| -rwxr-xr-x | cobblersyslogd | 12 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 41 insertions, 11 deletions
@@ -1,6 +1,12 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) +* Mon Jan 28 2007 - 0.3.9 +- Make init scripts correspond with FC-E guidelines + +* Thu Jan 24 2007 - 0.3.8 +- Fixed minor bug in logfile processing related to 0.3.7 + * Thu Jan 24 2007 - 0.3.7 - Default/examples kickstarts are now fully automatic (added hd type/size detection). - Kickstart tracking now includes remote syslog support, just run "cobbler sync" to enable. diff --git a/cobbler.spec b/cobbler.spec index d427df4..72a201d 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler -Version: 0.3.8 +Version: 0.3.9 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL @@ -13,6 +13,9 @@ Requires: tftp-server Requires: python-devel Requires: createrepo Requires: mod_python +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch @@ -21,7 +24,15 @@ Url: http://cobbler.et.redhat.com %description -Cobbler is a command line tool for configuration of network boot and update servers. It is also accessible as a Python library. Cobbler supports PXE, provisioning virtualized images, and reinstalling machines that are already up and running (over SSH). The last two modes require a helper tool called 'koan' that integrates with cobbler. Cobbler's advanced features include importing distributions from rsync mirrors, kickstart templating, integrated yum mirroring, kickstart monitoring, and auto-managing dhcpd.conf. +Cobbler is a command line tool for configuration of network \ +boot and update servers. It is also available as a Python \ +library. Cobbler supports PXE, provisioning virtualized images, \ +and reinstalling machines that are already running (over SSH). \ +The last two modes require a helper tool called 'koan' that \ +integrates with cobbler. Cobbler's advanced features include \ +importing distributions from rsync mirrors, kickstart templating, \ +integrated yum mirroring, kickstart monitoring, and auto-managing \ +dhcpd.conf. %prep %setup -q @@ -34,10 +45,18 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT %post -chkconfig --add cobblersyslogd +/sbin/chkconfig --add cobblersyslogd %preun -chkconfig --del cobblersyslogd +if [ $1 = 0 ]; then + /sbin/service cobblersyslogd stop >/dev/null 2>&1 || : + chkconfig --del cobblersyslogd +fi + +%postun +if [ "$1" -ge "1" ]; then + /sbin/service cobblersyslogd condrestart >/dev/null 2>&1 || : +fi %clean test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT @@ -72,6 +91,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 28 2007 Michael DeHaan <mdehaan@redhat.com> - 0.3.9-1 +- Changed init script pre/post code to match FC-E guidelines/example +- Shortened RPM description +- (also see CHANGELOG) + * Thu Jan 24 2007 Michael DeHaan <mdehaan@redhat.com> - 0.3.8-1 - Upstream changes (see CHANGELOG) diff --git a/cobblersyslogd b/cobblersyslogd index 892e3de..b8bc3f7 100755 --- a/cobblersyslogd +++ b/cobblersyslogd @@ -19,7 +19,7 @@ RETVAL=0 start() { echo -n $"Starting cobbler remote syslog monitor: " - if test -f /var/lock/subsys/cobbler_syslogd ; then + if test -f /var/lock/subsys/cobblersyslogd ; then echo_failure echo return 1 @@ -28,28 +28,28 @@ start() { RETVAL=$? echo_success echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cobbler_syslogd + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cobblersyslogd return $RETVAL } stop() { echo -n $"Stopping cobbler remote syslog monitor: " - if ! test -f /var/lock/subsys/cobbler_syslogd ; then + if ! test -f /var/lock/subsys/cobblersyslogd ; then echo_failure echo return 1 fi pkill cobbler_syslogd RETVAL=$? - rm /var/lock/subsys/cobbler_syslogd + rm /var/lock/subsys/cobblersyslogd echo_success echo return $RETVAL } mystatus() { - if test -f /var/lock/subsys/cobbler_syslogd ; then + if test -f /var/lock/subsys/cobblersyslogd ; then echo "cobbbler_syslogd is running..." return 0 fi @@ -75,7 +75,7 @@ case "$1" in start ;; condrestart) - if [ -f /var/lock/subsys/$servicename ]; then + if [ -f /var/lock/subsys/cobblersyslogd ]; then stop start fi @@ -4,7 +4,7 @@ import sys from distutils.core import setup, Extension import string -VERSION = "0.3.8" +VERSION = "0.3.9" SHORT_DESC = "Boot and update server configurator" LONG_DESC = """ Cobbler is a command line tool for configuration of boot/provisioning, and update servers which is also accessible as a Python library. Cobbler supports PXE, provisioning virtualized images, and reinstalling machines that are already up and running (over SSH). The last two modes require a helper tool called 'koan' that integrates with cobbler. Cobbler's advanced features include importing distributions from rsync mirrors, kickstart templating, integrated yum mirroring (and linking repository setup with kickstarts), plus managing dhcpd.conf. |