summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXimin Luo <infinity0@debian.org>2017-01-13 15:00:31 +0100
committerHolger Levsen <holger@layer-acht.org>2017-01-13 15:03:10 +0100
commit3da1a4e2fce52fd647c4a583394ee3c72b950b77 (patch)
tree83dd556753a5fe9332ee574cbb42c0e416cba108
parent62566b57f9c50189f69660e6b029c82c24cef671 (diff)
downloadjenkins.debian.net-3da1a4e2fce52fd647c4a583394ee3c72b950b77.tar.xz
Fix check for /dev/shm and /run/shm, check both
-rwxr-xr-xbin/reproducible_maintenance.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index ad014f24..afbb3d8e 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -62,8 +62,9 @@ if [ $? -ne 0 ] ; then
exit 1
fi
# check for /(run|dev)/shm being mounted
-echo "$(date -u) - testing whether /(run|dev)/shm is mounted..."
-mount | egrep -q "^tmpfs on /(run|dev)/shm"
+echo "$(date -u) - testing whether /(run|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 /run/shm" && test "$(stat -c %a -L /run/shm)" = 1777
if [ $? -ne 0 ] ; then
irc_message debian-reproducible "/(run|dev)/shm is not mounted correctly on $HOSTNAME, please tell the jenkins admins to fix this. (by adding 'none /dev/shm tmpfs rw,nosuid,nodev,noexec 0 0' to /etc/fstab"
exit 1