Git-Mirrors/security-misc
1
0
Fork 0
mirror of https://github.com/Kicksecure/security-misc.git synced 2024-10-01 08:25:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73 from madaidan/sysctl-initramfs

Browse Source 
Only remount in sysctl-initramfs if already mounted read-only
This commit is contained in:
Patrick Schleizer 2020-03-21 18:11:57 +00:00 committed by GitHub
commit 1cbc7f6bed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/initramfs-tools/scripts/init-bottom/sysctl-initramfs
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