From: Harald Hoyer <harald@redhat.com>
Date: Mon, 14 Nov 2016 11:29:12 +0000 (+0100)
Subject: Revert "TEST-99-RPM: use --best and install all rpms"
X-Git-Tag: 045~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d941f0e015440a3298203619291340d14badc265;p=thirdparty%2Fdracut.git

Revert "TEST-99-RPM: use --best and install all rpms"

This reverts commit f81806db208a55bc4a6b04eb89cabf062c79f3ef.
---

diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
index f2efea0cf..345d5240b 100755
--- a/test/TEST-99-RPM/test.sh
+++ b/test/TEST-99-RPM/test.sh
@@ -36,7 +36,6 @@ trap '[[ -d $rootdir ]] && { umount "$rootdir/proc"; umount "$rootdir/sys"; umou
     command -v dnf >/dev/null && { dnf_or_yum="dnf"; dnf_or_yum_cmd="dnf --allowerasing"; }
     $dnf_or_yum_cmd -v --nogpgcheck --installroot "$rootdir"/ --releasever 25 --disablerepo='*' \
                 --enablerepo=fedora --enablerepo=updates \
-                --best \
                 install -y \
 	$dnf_or_yum \
 	passwd \
@@ -51,8 +50,11 @@ trap '[[ -d $rootdir ]] && { umount "$rootdir/proc"; umount "$rootdir/sys"; umou
 	mdadm \
     bash \
     iscsi-initiator-utils \
-    "$TESTDIR"/dracut-*.rpm \
+    "$TESTDIR"/dracut-[0-9]*.$(arch).rpm \
     ${NULL}
+    #"$TESTDIR"/dracut-config-rescue-[0-9]*.$(arch).rpm \
+    #"$TESTDIR"/dracut-network-[0-9]*.$(arch).rpm \
+#    ${NULL}
 
     cat >"$rootdir"/test.sh <<EOF
 #!/bin/bash