X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/752a8ca88deb105b0689523131d4f5117ddb1c54..b5cbddd9711abdb4fd7d75145257c1b722f989a0:/devel/upload.in

diff --git a/devel/upload.in b/devel/upload.in
index f2325cd..9168285 100644
--- a/devel/upload.in
+++ b/devel/upload.in
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2006, 2007 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 # This is a test script to ease development and testing on test clusters.
 # It should not be used to update production environments.
 
-# Usage: upload.sh node-{1,2,3}
+# Usage: upload node-{1,2,3}
 # it will upload the python libraries to
 # $prefix/lib/python2.4/site-packages/ganeti and the command line utils to
 # $prefix/sbin. It needs passwordless root login to the nodes.
@@ -33,6 +33,7 @@ PKGLIBDIR='@PKGLIBDIR@'
 
 NO_RESTART=
 NO_CRON=
+NO_DEBUG=
 hosts=
 while [ "$#" -gt 0 ]; do
   opt="$1"
@@ -43,6 +44,9 @@ while [ "$#" -gt 0 ]; do
     --no-cron)
       NO_CRON=1
       ;;
+    --no-debug)
+      NO_DEBUG=1
+      ;;
     -h|--help)
       echo "Usage: $0 [--no-restart] hosts..."
       exit 0
@@ -60,6 +64,8 @@ done
 
 set ${hosts}
 
+make regen-vcs-version
+
 TXD=`mktemp -d`
 trap 'rm -rf $TXD' EXIT
 
@@ -70,6 +76,9 @@ else
   make_args=
 fi
 
+# Make sure that directories will get correct permissions
+umask 0022
+
 # install ganeti as a real tree
 make $make_args install DESTDIR="$TXD"
 
@@ -78,7 +87,7 @@ make $make_args install DESTDIR="$TXD"
 install -D --mode=0755 doc/examples/ganeti.initd \
   "$TXD/$SYSCONFDIR/init.d/ganeti"
 
-[ -f doc/examples/ganeti.default-debug ] && \
+[ -f doc/examples/ganeti.default-debug -a -z "$NO_DEBUG" ] && \
 install -D --mode=0644 doc/examples/ganeti.default-debug \
   "$TXD/$SYSCONFDIR/default/ganeti"