summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2020-01-18 16:38:41 +0000
committerBen Hutchings <ben@decadent.org.uk>2020-01-18 18:36:00 +0000
commitd6c6eeca3540d18f5bce95b5ffcb1823ab3050ea (patch)
tree2cf6d2cb60ea457a8c860f275cde788181b65410
parent897ab776458b85784a8c4ec366465c98d153d498 (diff)
init: Mount /dev with "exec" option if v86d is present
v86d currently maps parts of /dev/mem as executable, even though it may use an emulator. For now, only mount /dev with the "noexec" option if it's not present. Closes: #940171 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rwxr-xr-xinit3
1 files changed, 2 insertions, 1 deletions
diff --git a/init b/init
index e60ac11..2855753 100755
--- a/init
+++ b/init
@@ -33,7 +33,8 @@ export quiet
# Note that this only becomes /dev on the real filesystem if udev's scripts
# are used; which they will be, but it's worth pointing out
-mount -t devtmpfs -o noexec,nosuid,mode=0755 udev /dev
+test -x /usr/sbin/v86d && dev_exec="exec" || dev_exec="noexec"
+mount -t devtmpfs -o $dev_exec,nosuid,mode=0755 udev /dev
mkdir /dev/pts
mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts || true