Skip to content
Snippets Groups Projects
Commit 16a833d7 authored by Iustin Pop's avatar Iustin Pop
Browse files

Fix OCF files installation in devel/upload

LIBDIR was not defined, so the files ended up directly under /, not
good. Now they're properly installed under /usr/lib/ocf, as per
http://linux-ha.org/wiki/OCF_Resource_Agents

.

Also add "set -u" to prevent future occurrences of this kind of bug.

Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 11eb5cd0
No related branches found
No related tags found
No related merge requests found
#!/bin/bash #!/bin/bash
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2012 Google Inc. # Copyright (C) 2006, 2007, 2008, 2009, 2010, 2012, 2013 Google Inc.
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# $prefix/lib/python2.4/site-packages/ganeti and the command line utils to # $prefix/lib/python2.4/site-packages/ganeti and the command line utils to
# $prefix/sbin. It needs passwordless root login to the nodes. # $prefix/sbin. It needs passwordless root login to the nodes.
set -e set -e -u
usage() { usage() {
echo "Usage: $0 [--no-restart] [--no-cron] [--no-debug] hosts..." >&2 echo "Usage: $0 [--no-restart] [--no-cron] [--no-debug] hosts..." >&2
...@@ -92,6 +92,7 @@ make $make_args install DESTDIR="$TXD" ...@@ -92,6 +92,7 @@ make $make_args install DESTDIR="$TXD"
# fixed; we can read the prefix vars/etc. # fixed; we can read the prefix vars/etc.
PREFIX="$(echo @PREFIX@ | $SED)" PREFIX="$(echo @PREFIX@ | $SED)"
SYSCONFDIR="$(echo @SYSCONFDIR@ | $SED)" SYSCONFDIR="$(echo @SYSCONFDIR@ | $SED)"
LIBDIR="$(echo @LIBDIR@ | $SED)"
PKGLIBDIR="$(echo @PKGLIBDIR@ | $SED)" PKGLIBDIR="$(echo @PKGLIBDIR@ | $SED)"
# copy additional needed files # copy additional needed files
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment