From 3da1a4e2fce52fd647c4a583394ee3c72b950b77 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Fri, 13 Jan 2017 15:00:31 +0100 Subject: Fix check for /dev/shm and /run/shm, check both --- bin/reproducible_maintenance.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bin') 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 -- cgit v1.2.3-70-g09d2