New commits:
commit c6d6bc3cf26f576fc19ba8fe08270791da4b8a92
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
fixed check_tmp_noexec for tmp-less systems
(cherry picked from commit e56a7d51157cbf2dde47515a5abd8cf17a5d2313)
Conflicts:
ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 443ce12..ce6eece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-04-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * FUNCTIONS: fixed check_tmp_noexec for tmp-less systems
+
2015-04-14 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/FUNCTIONS: fixed arguments' passing to the root
FUNCTIONS
diff --git a/FUNCTIONS b/FUNCTIONS
index 383d62e..261eb7a 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -721,6 +721,11 @@ function check_tmp_noexec() {
return 1
fi &&
+ if ! mountpoint -q $1; then
+ message "${MESSAGE_COLOR}There's no $1 mount point, nothing to
check.${DEFAULT_COLOR}"
+ return 0
+ fi &&
+
if awk -v tmp=$1 '{ if ($2 == tmp) print $4 }' < /proc/mounts | grep -q
noexec; then
message -n "${MESSAGE_COLOR}Remounting $1 with exec option (required for
build)... " &&
mount -o exec,remount $1 &&
[SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (c6d6bc3cf26f576fc19ba8fe08270791da4b8a92),
Vlad Glagolev, 04/22/2015