Merge pull request #134 from monsieuremre/patch-1

Fix double mount issue for /var/log and /var/tmp
This commit is contained in:
Patrick Schleizer 2023-10-24 05:22:33 -04:00 committed by GitHub
commit 5320c11f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -232,14 +232,6 @@ _tmp() {
remount_secure
}
_var() {
mount_folder="$NEWROOT/var"
## noexec: Not possible. Reason:
## Debian stores executable maintainer scripts in /var/lib/dpkg/info folder.
intended_mount_options="nosuid,nodev"
remount_secure
}
_var_tmp() {
mount_folder="$NEWROOT/var/tmp"
intended_mount_options="nosuid,nodev${most_noexec_maybe}"
@ -252,6 +244,14 @@ _var_log() {
remount_secure
}
_var() {
mount_folder="$NEWROOT/var"
## noexec: Not possible. Reason:
## Debian stores executable maintainer scripts in /var/lib/dpkg/info folder.
intended_mount_options="nosuid,nodev"
remount_secure
}
_lib() {
mount_folder="$NEWROOT/lib"
## Cannot use noexec on /lib as per:
@ -289,9 +289,9 @@ main() {
_dev
_dev_shm
_tmp
_var
_var_tmp
_var_log
_var
_home
end