[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.0.6-2-20-g7fef725

[Iustin Pop]

The following commit has been merged in the master branch:
commit a922ed3ead1d223b0c1d1f3784a75b9abbd20255
Author: Iustin Pop <iustin at debian.org>
Date:   Sat Apr 17 20:25:19 2010 +0200

    Add patch to remove old ssconf file on upgrade
    
    This is needed for the Debian package but not necessarily for upstream.

diff --git a/debian/patches/cfgupgrade12-remove-old-ssconf.patch b/debian/patches/cfgupgrade12-remove-old-ssconf.patch
new file mode 100644
index 0000000..008cc55
--- /dev/null
+++ b/debian/patches/cfgupgrade12-remove-old-ssconf.patch
@@ -0,0 +1,19 @@
+Description: Remove obsolete ssconf files
+  Debian packaging relies on obsolete ssconf files to detect whether the
+  upgrade has completed or not; this is not needed for upstream,
+  although it is a good cleanup
+Author: Iustin Pop <iustin at debian.org>
+Last-Update: 2010-04-17
+--- a/tools/cfgupgrade12
++++ b/tools/cfgupgrade12
+@@ -404,6 +404,10 @@
+         logging.debug("Writing RAPI certificate to %s", options.RAPI_CERT_FILE)
+         bootstrap.GenerateSelfSignedSslCert(options.RAPI_CERT_FILE)
+ 
++      ss_hyp = SsconfName('hypervisor')
++      if os.path.exists(ss_hyp):
++        utils.RemoveFile(ss_hyp)
++
+   except:
+     logging.critical("Writing configuration failed. It is probably in an"
+                      " inconsistent state and needs manual intervention.")
diff --git a/debian/patches/series b/debian/patches/series
index e900057..52eba52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 fix-startup-with-old-config.patch
 import-cfgupgrade12.patch
+cfgupgrade12-remove-old-ssconf.patch
 fix-check-man.patch
 fix-watcher-hooks-warning.patch

-- 
Ganeti packaging