summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-10-19 15:05:49 -0400
committerMichael DeHaan <mdehaan@redhat.com>2007-10-19 15:05:49 -0400
commitd09c20fc07efb87cffcbac467f189e312eb67e9e (patch)
treec4e7c3b2196afb2ad66bfe30b5e4401e1921caa0
parent8350279beec5475cb1e9eb17ff314ba24d18f6d6 (diff)
downloadthird_party-cobbler-d09c20fc07efb87cffcbac467f189e312eb67e9e.tar.gz
third_party-cobbler-d09c20fc07efb87cffcbac467f189e312eb67e9e.tar.xz
third_party-cobbler-d09c20fc07efb87cffcbac467f189e312eb67e9e.zip
Make RPMs backup the old config, migrate, and conditionally restart the service to make upgrades seamless.
-rw-r--r--cobbler.spec10
-rw-r--r--cobbler/webui/master.py4
-rw-r--r--setup.py4
3 files changed, 11 insertions, 7 deletions
diff --git a/cobbler.spec b/cobbler.spec
index 85adb99..89de848 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -53,13 +53,13 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
%post
-cp /var/lib/cobbler/distros* /var/lib/cobbler/backup
-cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup
-cp /var/lib/cobbler/systems* /var/lib/cobbler/backup
-cp /var/lib/cobbler/repos* /var/lib/cobbler/backup
+cp /var/lib/cobbler/distros* /var/lib/cobbler/backup 2>/dev/null
+cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
+cp /var/lib/cobbler/systems* /var/lib/cobbler/backup 2>/dev/null
+cp /var/lib/cobbler/repos* /var/lib/cobbler/backup 2>/dev/null
/usr/bin/cobbler reserialize
/sbin/chkconfig --add cobblerd
-/sbin/service cobblerd restart
+/sbin/service cobblerd condrestart
%preun
diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py
index 5e8f9e7..c861aeb 100644
--- a/cobbler/webui/master.py
+++ b/cobbler/webui/master.py
@@ -33,8 +33,8 @@ VFN=valueForName
currentTime=time.time
__CHEETAH_version__ = '2.0rc8'
__CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8)
-__CHEETAH_genTime__ = 1192212078.11906
-__CHEETAH_genTimestamp__ = 'Fri Oct 12 14:01:18 2007'
+__CHEETAH_genTime__ = 1192820351.713706
+__CHEETAH_genTimestamp__ = 'Fri Oct 19 14:59:11 2007'
__CHEETAH_src__ = 'webui_templates/master.tmpl'
__CHEETAH_srcLastModified__ = 'Fri Oct 12 11:53:14 2007'
__CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'
diff --git a/setup.py b/setup.py
index 87fcd39..d064388 100644
--- a/setup.py
+++ b/setup.py
@@ -14,6 +14,7 @@ if __name__ == "__main__":
# docspath="share/doc/koan-%s/" % VERSION
manpath = "share/man/man1/"
cobpath = "/var/lib/cobbler/"
+ backpath = "/var/lib/cobbler/backup/"
etcpath = "/etc/cobbler/"
wwwconf = "/etc/httpd/conf.d/"
wwwpath = "/var/www/cobbler/"
@@ -72,6 +73,9 @@ if __name__ == "__main__":
(initpath, ['config/cobblerd']),
(cobpath, ['config/settings']),
+ # backups for upgrades
+ (backpath, []),
+
# bootloaders and syslinux support files
(cobpath, ['loaders/elilo-3.6-ia64.efi']),
(cobpath, ['loaders/menu.c32']),