diff -r bae5adee8c8c -r 9d0a04089d22 test/named-root.sh --- a/test/named-root.sh Fri Oct 17 09:57:19 2014 +0100 +++ b/test/named-root.sh Mon Jul 11 16:49:53 2016 +0100 @@ -6,19 +6,19 @@ 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 $razor list-files >&2 exit 1 fi - $razor list-files c: | grep -x "$1" > /dev/null + $razor list-files c: | grep -F -x "$1" > /dev/null if [ $? -ne 0 ]; then echo $1: Not seen by named root list >&2 $razor list-files c: >&2 exit 1 fi - $razor list-files "$1" | grep -x "$1" > /dev/null + $razor list-files "$1" | grep -F -x "$1" > /dev/null if [ $? -ne 0 ]; then echo $1: Not seen by patterned list >&2 $razor list-files "$1" >&2 @@ -32,24 +32,23 @@ fi for nevra in "$pkgs"; do name=`echo $nevra | sed 's/\-.*$//'` - $razor list-package-files "$name" | grep -x "$1" > /dev/null + $razor list-package-files "$name" | grep -F -x "$1" > /dev/null if [ $? -ne 0 ]; then echo $1: Not in database for package $name >&2 $razor list-package-files "$name" exit 1 fi done - if [ ! -e "$RAZOR_ROOT$1" ]; then + if [ ! -e "$tmpdir/$1" ]; then echo $1: Not in filesystem >&2 exit 1 fi } tmpdir=`mktemp -dt` || exit 1 -export RAZOR_ROOT="$tmpdir/x-" -mkdir -p "$tmpdir/x-/var/lib" "$tmpdir/x-c:" +export RAZOR_ROOT="file:$tmpdir" export RAZOR_NO_ROOT_NAME_CHECKS=1 $razor init || exit 1 -export YUM_URL="file://localhost/`pwd`" +export YUM_URL="file:`pwd`/base" $razor import-yum || exit 1 $razor install --relocate /usr=c:/test zap || exit 1 $razor install --relocate /usr=c:/test zip || exit 1