[Pkg-ganeti-devel] [ganeti] 01/02: Fix broken extstorage support

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit a9c142dc670b4d9eba3cfc2ade8724fb33c08aac
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Thu Mar 27 16:18:11 2014 +0200

    Fix broken extstorage support
    
    Cherry-pick upstream commit b26a275a0, fixing broken extstorage support.
    
    Closes: #742699
---
 .../0001-Fix-specification-of-TIDiskParams.patch   | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/0001-Fix-specification-of-TIDiskParams.patch b/debian/patches/0001-Fix-specification-of-TIDiskParams.patch
new file mode 100644
index 0000000..d6ad753
--- /dev/null
+++ b/debian/patches/0001-Fix-specification-of-TIDiskParams.patch
@@ -0,0 +1,32 @@
+From 49ee1838bffb5960e5e9bd59c0187d47203c2b44 Mon Sep 17 00:00:00 2001
+From: Klaus Aehlig <aehlig at google.com>
+Date: Mon, 3 Feb 2014 17:50:11 +0100
+Subject: [PATCH] Fix specification of TIDiskParams
+
+Commit 580b1fdd incorrectly assumes that disk parameters are
+just the standard ones, whereas the man page explicitly states
+that additional parameters can be passed as well, if they make
+sense for the chosen storage type. Fix this.
+
+Signed-off-by: Klaus Aehlig <aehlig at google.com>
+Reviewed-by: Petr Pudlak <pudlak at google.com>
+---
+ lib/ht.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ht.py b/lib/ht.py
+index d6171ac..ee82148 100644
+--- a/lib/ht.py
++++ b/lib/ht.py
+@@ -570,7 +570,7 @@ TINicParams = \
+                                       TMaybe(TString)))
+ 
+ TIDiskParams = \
+-    Comment("Disk parameters")(TDictOf(TElemOf(constants.IDISK_PARAMS),
++    Comment("Disk parameters")(TDictOf(TNonEmptyString,
+                                        TOr(TNonEmptyString, TInt)))
+ 
+ THypervisor = TElemOf(constants.HYPER_TYPES)
+-- 
+1.9.0
+
diff --git a/debian/patches/series b/debian/patches/series
index e82830b..7c78fc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
 pass-ghc-linker-flags.patch
+0001-Fix-specification-of-TIDiskParams.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git