From: Harald Hoyer <harald@redhat.com>
Date: Fri, 31 May 2013 08:00:07 +0000 (+0200)
Subject: TEST-99-RPM: generate rpms and exclude /boot loader entries
X-Git-Tag: 028~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd28794bbcb0d3b5f46e117251130c2676c8f271;p=thirdparty%2Fdracut.git

TEST-99-RPM: generate rpms and exclude /boot loader entries
---

diff --git a/Makefile b/Makefile
index 2b130d9f4..06dd10568 100644
--- a/Makefile
+++ b/Makefile
@@ -187,7 +187,7 @@ syncheck:
 		bash -n "$$i" ; ret=$$(($$ret+$$?)); \
 	done;exit $$ret
 
-check: all syncheck
+check: all syncheck rpm
 	@[ "$$EUID" == "0" ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; }
 	@$(MAKE) -C test check
 
diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
index 8ae7f8e2b..e774168f3 100755
--- a/test/TEST-99-RPM/test.sh
+++ b/test/TEST-99-RPM/test.sh
@@ -52,6 +52,8 @@ find / -xdev -type f -not -path '/var/*' \
   -not -path '/etc/iscsi/initiatorname.iscsi' \
   -not -path '/boot/*0-rescue*' \
   -not -path '/dev/null' \
+  -not -path "/boot/loader/entries/\$(cat /etc/machine-id)-*" \
+  -not -path "/boot/\$(cat /etc/machine-id)/*" \
   -exec rpm -qf '{}' ';' | \
   grep -F 'not owned' &> /test.output
 exit