base/init.sh: don't mount /run with noexec, if the initramfs lives there

If the initramfs was built with prefix=/run/... /run can't be mounted
with noexec, otherwise no binary can be run.

Guard against it by looking where /bin/sh is really located.
master
Harald Hoyer 2016-04-14 14:56:37 +02:00
parent b99e72427b
commit db7d61cff7
1 changed files with 6 additions and 1 deletions

View File

@ -64,7 +64,12 @@ fi

if ! ismounted /run; then
mkdir -m 0755 /newrun
mount -t tmpfs -o mode=0755,noexec,nosuid,nodev,strictatime tmpfs /newrun >/dev/null
if ! str_starts "$(readlink -f /bin/sh)" "/run/"; then
mount -t tmpfs -o mode=0755,noexec,nosuid,nodev,strictatime tmpfs /newrun >/dev/null
else
# the initramfs binaries are located in /run, so don't mount it with noexec
mount -t tmpfs -o mode=0755,nosuid,nodev,strictatime tmpfs /newrun >/dev/null
fi
cp -a /run/* /newrun >/dev/null 2>&1
mount --move /newrun /run
rm -fr -- /newrun