Fix double mount issue for /var/log and /var/tmp

Mounting var with bind and mounting a subdirectory causes /var/tmp and /var/log bind mounted twice each. can be checked with lsblk. When we bind mount var only after having mounted the subdirectories, everything is mounted only one.
This commit is contained in:
monsieuremre 2023-10-23 15:33:05 +00:00 committed by GitHub
parent f3b40f12cb
commit f0857fd560
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