From 5f6b326c52a53fbc709c1c35bf1a301b1593a775 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Mon, 8 Nov 2010 19:35:42 +0100 Subject: [PATCH] bug #382: ISO tmp path for context does not work in system wide installations --- src/tm_mad/lvm/tm_context.sh | 6 +++++- src/tm_mad/ssh/tm_context.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/tm_mad/lvm/tm_context.sh b/src/tm_mad/lvm/tm_context.sh index b420be348a..417c82e78d 100755 --- a/src/tm_mad/lvm/tm_context.sh +++ b/src/tm_mad/lvm/tm_context.sh @@ -42,7 +42,11 @@ DST_PATH=`arg_path $DST` DST_DIR=`dirname $DST_PATH` DST_FILE=`basename $DST_PATH` DST_HASH=`echo -n $DST | $MD5SUM | $AWK '{print $1}'` -TMP_DIR="$ONE_LOCATION/var/$DST_HASH" +if [ -z "$ONE_LOCATION" ]; then + TMP_DIR="/var/lib/one/$DST_HASH" +else + TMP_DIR="$ONE_LOCATION/var/$DST_HASH" +fi ISO_DIR="$TMP_DIR/isofiles" diff --git a/src/tm_mad/ssh/tm_context.sh b/src/tm_mad/ssh/tm_context.sh index b420be348a..417c82e78d 100755 --- a/src/tm_mad/ssh/tm_context.sh +++ b/src/tm_mad/ssh/tm_context.sh @@ -42,7 +42,11 @@ DST_PATH=`arg_path $DST` DST_DIR=`dirname $DST_PATH` DST_FILE=`basename $DST_PATH` DST_HASH=`echo -n $DST | $MD5SUM | $AWK '{print $1}'` -TMP_DIR="$ONE_LOCATION/var/$DST_HASH" +if [ -z "$ONE_LOCATION" ]; then + TMP_DIR="/var/lib/one/$DST_HASH" +else + TMP_DIR="$ONE_LOCATION/var/$DST_HASH" +fi ISO_DIR="$TMP_DIR/isofiles"