summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-05-31 10:00:07 +0200
committerHarald Hoyer <harald@redhat.com>2013-05-31 10:00:07 +0200
commitfd28794bbcb0d3b5f46e117251130c2676c8f271 (patch)
treec46e8cdcfc372261bb5dc7c18a4f84ee6e67e237
parentd18fd0235bfdbb845eac35c6d45b06168cb37900 (diff)
downloaddracut-fd28794bbcb0d3b5f46e117251130c2676c8f271.tar.gz
dracut-fd28794bbcb0d3b5f46e117251130c2676c8f271.tar.bz2
dracut-fd28794bbcb0d3b5f46e117251130c2676c8f271.zip
TEST-99-RPM: generate rpms and exclude /boot loader entries
-rw-r--r--Makefile2
-rwxr-xr-xtest/TEST-99-RPM/test.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2b130d9f..06dd1056 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 8ae7f8e2..e774168f 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