Merge remote-tracking branch 'origin/master'

This commit is contained in:
Patrick Schleizer 2020-03-21 14:12:25 -04:00
commit 7c25fc517e
No known key found for this signature in database
GPG Key ID: CB8D50BB77BB3C48

View File

@ -16,10 +16,15 @@ prereqs)
esac
## ${rootmnt} is mounted read-only in the initramfs so it needs to be remounted first.
mount -o remount,rw "${rootmnt}"
if mount | grep "${rootmnt}" | grep -q "(ro,"; then
remount="yes"
mount -o remount,rw "${rootmnt}"
fi
sysctl -p ${rootmnt}/etc/sysctl.conf >/dev/null 2>${rootmnt}/var/log/sysctl-initramfs-error.log
sysctl -p ${rootmnt}/etc/sysctl.d/*.conf >/dev/null 2>>${rootmnt}/var/log/sysctl-initramfs-error.log
mount -o remount,ro "${rootmnt}"
sysctl -p ${rootmnt}/etc/sysctl.d/*.conf >/dev/null 2>>${rootmnt}/var/log/sysctl-initramfs-error.log
if [ "${remount}" = "yes" ]; then
mount -o remount,ro "${rootmnt}"
fi
grep -v "unprivileged_userfaultfd" "${rootmnt}/var/log/sysctl-initramfs-error.log"
true