Merge remote-tracking branch 'origin/master'

This commit is contained in:
Patrick Schleizer 2020-03-21 13:28:43 -04:00
commit 20f0c574d5
No known key found for this signature in database
GPG Key ID: CB8D50BB77BB3C48

View File

@ -15,8 +15,11 @@ prereqs)
;;
esac
## ${rootmnt} is mounted read-only in the initramfs so it needs to be remounted first.
mount -o remount,rw "${rootmnt}"
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
grep -v "unprivileged_userfaultfd" /var/log/sysctl-initramfs-error.log
mount -o remount,ro "${rootmnt}"
grep -v "unprivileged_userfaultfd" "${rootmnt}/var/log/sysctl-initramfs-error.log"
true