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

[Iustin Pop]

The following commit has been merged in the master branch:
commit 8a7f92a81c4dcb3b16cd42d750a71967e525cee4
Author: Iustin Pop <iusty at k1024.org>
Date:   Fri Dec 4 20:24:17 2009 +0100

    Add patch to enable fqdn mode on the ssh command

diff --git a/debian/changelog b/debian/changelog
index c687d74..3acb41a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ ganeti (2.0.4-1) unstable; urgency=low
   * Update to standards version 3.8.3 (no changes needed)
   * Switch to source format 3.0 (quilt) and drop quilt rules/depencency
   * Add doc-base files for the main html docs we ship
+  * Add patch to call hostname with "--fqdn" to workaround recent changes which
+    always strip the domain name
 
- -- Iustin Pop <iusty at k1024.org>  Fri, 04 Dec 2009 19:37:33 +0100
+ -- Iustin Pop <iusty at k1024.org>  Fri, 04 Dec 2009 20:23:45 +0100
 
 ganeti (2.0.3-1) unstable; urgency=low
 
diff --git a/debian/patches/hostname-fqdn.patch b/debian/patches/hostname-fqdn.patch
new file mode 100644
index 0000000..d4ff095
--- /dev/null
+++ b/debian/patches/hostname-fqdn.patch
@@ -0,0 +1,18 @@
+Description: Workaround hostname stripping the domain when invoked as simply
+ "hostname" even if the machine name is FQDN
+ .
+ Upstream knows the issues related to hostnames and plans to change the handling
+ of hostnames in a future version
+Forwarded: not-needed
+Author: Iustin Pop <iusty at k1024.org>
+--- a/lib/ssh.py
++++ b/lib/ssh.py
+@@ -212,7 +212,7 @@
+         - detail: string with details
+ 
+     """
+-    retval = self.Run(node, 'root', 'hostname')
++    retval = self.Run(node, 'root', 'hostname --fqdn')
+ 
+     if retval.failed:
+       msg = "ssh problem"
diff --git a/debian/patches/series b/debian/patches/series
index 2465d9c..db5be31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+hostname-fqdn.patch
 fix-startup-with-old-config.patch

-- 
Ganeti packaging