[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/1.2.7-1-23-g6ddd5d5

[Iustin Pop]

The following commit has been merged in the master branch:
commit 106508bbf599dac81936635be8a07727ddf2e855
Author: Iustin Pop <iusty at k1024.org>
Date:   Tue Aug 4 21:19:01 2009 +0200

    Fix the startup-with-1.2-config (Closes: #539303)
    
    Before this patch, we abort if we don't find a new 2.0 ssconf key. But
    this is wrong, as it breaks noded startup at cluster init (when no
    ssconf keys exist at all). This patch changes so that we abort if a
    1.2-specific ssconf key if found (reverse test).
    
    The patch also changes the exit code to show failure, so that errors are
    more easily detected.

diff --git a/debian/patches/fix-startup-with-old-config.patch b/debian/patches/fix-startup-with-old-config.patch
index 28830b4..ac52f10 100644
--- a/debian/patches/fix-startup-with-old-config.patch
+++ b/debian/patches/fix-startup-with-old-config.patch
@@ -11,12 +11,12 @@ Mon, 13 Jul 2009 21:23:25 +0200
      done
 +
 +    for fname in \
-+        "@LOCALSTATEDIR@/lib/ganeti/ssconf_node_list"
++        "@LOCALSTATEDIR@/lib/ganeti/ssconf_hypervisor"
 +    do
-+        if ! [ -f "$fname" ]; then
++        if [ -f "$fname" ]; then
 +            log_end_msg 0
 +            log_warning_msg "Configuration not upgraded to 2.0, will not run."
-+            exit 0
++            exit 1
 +        fi
 +    done
 +

-- 
Ganeti packaging