[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: explicitly pin down the exact problem with /(dev|run)/shm

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 15cb9ff2280e874728f2213081ea5cd8902530d9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Jan 21 14:02:54 2017 +0100

    reproducible Debian: explicitly pin down the exact problem with /(dev|run)/shm
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_maintenance.sh | 16 ++++++++++++----
 logparse/reproducible.rules     |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index 64427dd..c13bc2e 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -79,15 +79,23 @@ if [ $? -ne 0 ] ; then
 fi
 # check for /dev/shm being mounted properly
 echo "$(date -u) - testing whether /dev/shm is mounted correctly..."
-mount | egrep -q "^tmpfs on /dev/shm" && test "$(stat -c %a -L /dev/shm)" = 1777
+mount | egrep -q "^tmpfs on /dev/shm"
 if [ $? -ne 0 ] ; then
-	echo "Warning: /dev/shm is not mounted correctly on $HOSTNAME, please tell the jenkins admins to fix this."
+	echo "Warning: /dev/shm is not mounted correctly on $HOSTNAME, it should be a tmpfs, please tell the jenkins admins to fix this."
+	show_fstab_and_mounts
+fi
+test "$(stat -c %a -L /dev/shm)" = 1777
+if [ $? -ne 0 ] ; then
+	echo "Warning: /dev/shm is not mounted correctly on $HOSTNAME, it should be mounted with 1777 permissions, please tell the jenkins admins to fix this."
 	show_fstab_and_mounts
 fi
 # check for /run/shm being a link to /dev/shm
 echo "$(date -u) - testing whether /run/shm is a link..."
-if ! test -L /run/shm || [ "$(readlink /run/shm)" != "/dev/shm" ] ; then
-	echo "Warning: /run/shm not a link or not pointing to /dev/shm on $HOSTNAME, please tell the jenkins admins to fix this."
+if ! test -L /run/shm ; then
+	echo "Warning: /run/shm is not a link on $HOSTNAME, please tell the jenkins admins to fix this."
+	show_fstab_and_mounts
+elif [ "$(readlink /run/shm)" != "/dev/shm" ] ; then
+	echo "Warning: /run/shm is a link, but not pointing to /dev/shm on $HOSTNAME, please tell the jenkins admins to fix this."
 	show_fstab_and_mounts
 fi
 
diff --git a/logparse/reproducible.rules b/logparse/reproducible.rules
index 89cd841..3dfc66a 100644
--- a/logparse/reproducible.rules
+++ b/logparse/reproducible.rules
@@ -20,4 +20,4 @@ warning /Warning: failed to update Arch Linux schroot./
 warning /Warning: The following builds have failed due to diffoscope schroot problems and will be rescheduled.+/
 warning /W: The repository .+ is not signed./
 warning /W: There is no public key available for the following key IDs:.+/
-warning /Warning: /.../shm is not mounted correctly.+/
+warning /Warning: /.../shm.+please tell the jenkins admins to fix this./

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git