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

diff --git a/Makefile b/Makefile
index 2b130d9f48407b8c8fb385684612a2735cafc52d..06dd10568add26d5aafbc800f2cff4ec30a8b9f3 100644 (file)
--- 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 8ae7f8e2b930757b525970313f3cc29d9a25bd06..e774168f35045e266703b875a683d5a027afafa9 100755 (executable)
--- 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