diff -r bae5adee8c8c -r 6ba4c0f3c9d1 test/relocate.sh --- a/test/relocate.sh Fri Oct 17 09:57:19 2014 +0100 +++ b/test/relocate.sh Tue Jul 05 09:40:01 2016 +0100 @@ -1,4 +1,5 @@ #!/bin/sh +set -x if [ $# -gt 0 ]; then razor="$1" else @@ -6,19 +7,20 @@ fi check_file() { - $razor list-files | grep -x "$1" > /dev/null + $razor list-files | grep -F -x "$1" > /dev/null if [ $? -ne 0 ]; then echo $1: Not in database >&2 exit 1 fi - if [ ! -e "$RAZOR_ROOT$1" ]; then + if [ ! -e "$tmpdir$1" ]; then echo $1: Not in filesystem >&2 exit 1 fi } -export RAZOR_ROOT=`mktemp -dt` || exit 1 +tmpdir=`mktemp -dt` || exit 1 +export RAZOR_ROOT="file:$tmpdir" $razor init || exit 1 -export YUM_URL="file://localhost/`pwd`" +export YUM_URL="file:`pwd`/base" $razor import-yum || exit 1 $razor install zap || exit 1 $razor install --relocate /usr=/opt --relocate /etc=/opt/etc zsh || exit 1 @@ -26,4 +28,4 @@ check_file /usr/bin/zap check_file /opt/bin/zip check_file /opt/bin/zsh -rm -rf "$RAZOR_ROOT" +rm -rf "$tmpdir"