Hi, I would like to upload a fixed ganeti package in order to close #613648 (very stupid bug, sorry). Attached are the proposed changes, as formatted with git format-patch on top of our git tree (change not pushed yet). I confirm that the patch fixes the problem and that basic functionality has been tested for the updated package. It's a long time since I did a stable fix, so I might have gotten the distribution or the versioning wrong; please let me know! regards, iustin
From a1ff159ddfdc99b953428e032e335cba8030827b Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@debian.org> Date: Sat, 12 Mar 2011 14:27:32 +0100 Subject: [PATCH] Release 2.1.6-1+squeeze1, closing 613648 --- debian/changelog | 7 +++++++ debian/patches/fix-octal-mode.patch | 29 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 debian/patches/fix-octal-mode.patch diff --git a/debian/changelog b/debian/changelog index 9946b15..4620f2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ganeti (2.1.6-1+squeeze1) stable; urgency=low + + * Fix "Wrong permissions for /var/lock after 'gnt-node add'" (applied + patch fixing octal mode usage) (Closes: #613648) + + -- Iustin Pop <iustin@debian.org> Sat, 12 Mar 2011 14:24:52 +0100 + ganeti (2.1.6-1) unstable; urgency=low * New upstream version(s) diff --git a/debian/patches/fix-octal-mode.patch b/debian/patches/fix-octal-mode.patch new file mode 100644 index 0000000..70c2cdc --- /dev/null +++ b/debian/patches/fix-octal-mode.patch @@ -0,0 +1,29 @@ +Description: Fix octal mode usage for os.chmod + In Python 2.x, octal values need to be prefixed with '0', and Ganeti has two occurences + where this doesn't happen, leading to the mode being interpreted as decimal +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=ganeti.patch;att=1;bug=613648 +Bug-Debian: http://bugs.debian.org/613648 +From: Ronny Lindner <ronny.lindner@unister-gmbh.de> +Acked-by: Iustin Pop <iustin@debian.org> +--- a/daemons/ganeti-confd ++++ b/daemons/ganeti-confd +@@ -288,7 +288,7 @@ + constants.RELEASE_VERSION) + + dirs = [(val, constants.RUN_DIRS_MODE) for val in constants.SUB_RUN_DIRS] +- dirs.append((constants.LOCK_DIR, 1777)) ++ dirs.append((constants.LOCK_DIR, 01777)) + daemon.GenericMain(constants.CONFD, parser, dirs, CheckConfd, ExecConfd) + + +--- a/daemons/ganeti-noded ++++ b/daemons/ganeti-noded +@@ -893,7 +893,7 @@ + + dirs = [(val, constants.RUN_DIRS_MODE) for val in constants.SUB_RUN_DIRS] + dirs.append((constants.LOG_OS_DIR, 0750)) +- dirs.append((constants.LOCK_DIR, 1777)) ++ dirs.append((constants.LOCK_DIR, 01777)) + daemon.GenericMain(constants.NODED, parser, dirs, CheckNoded, ExecNoded, + console_logging=True) + diff --git a/debian/patches/series b/debian/patches/series index 62f588b..9416400 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +fix-octal-mode.patch fix-startup-with-old-config.patch cfgupgrade12-remove-old-ssconf.patch -- 1.7.4.1
Attachment:
signature.asc
Description: Digital signature