Updated Branches: refs/heads/4.0 8ed8b8b8b -> f57095aa0
Use /tmp as temporary location for injecting SSH keys into systemvm.iso When starting the management server with 'sudo' the $HOME will be set to the user calling sudo. This fixes CLOUDSTACK-218 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f57095aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f57095aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f57095aa Branch: refs/heads/4.0 Commit: f57095aa021f2e24d0973b0261e45c1c93d39560 Parents: 0daae2c Author: Wido den Hollander <[email protected]> Authored: Thu Sep 27 18:58:31 2012 +0200 Committer: Edison Su <[email protected]> Committed: Thu Sep 27 10:29:23 2012 -0700 ---------------------------------------------------------------------- scripts/vm/systemvm/injectkeys.sh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f57095aa/scripts/vm/systemvm/injectkeys.sh ---------------------------------------------------------------------- diff --git a/scripts/vm/systemvm/injectkeys.sh b/scripts/vm/systemvm/injectkeys.sh index e628b16..e56eb85 100755 --- a/scripts/vm/systemvm/injectkeys.sh +++ b/scripts/vm/systemvm/injectkeys.sh @@ -23,7 +23,7 @@ #set -x -TMP=${HOME}/tmp +TMP=/tmp MOUNTPATH=${HOME}/systemvm_mnt TMPDIR=${TMP}/cloud/systemvm @@ -80,7 +80,6 @@ systemvmpath=$3 command -v mkisofs > /dev/null || (echo "$(basename $0): mkisofs not found, please install or ensure PATH is accurate" ; exit 4) inject_into_iso systemvm.iso $newpubkey -#inject_into_iso systemvm-premium.iso $newpubkey [ $? -ne 0 ] && exit 5
