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

remount-secure: add support for --force; output

Browse Source
This commit is contained in:
Patrick Schleizer 2023-10-22 06:48:56 -04:00
parent 6dec5cb1d6
commit 6f4bf57ff2
No known key found for this signature in database
GPG Key ID: CB8D50BB77BB3C48
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr/libexec/security-misc/remount-secure
View File

@ -77,23 +77,28 @@ remount_secure() {
mount_line_of_mount_folder="$(echo "$mount_output" | grep "$mount_folder ")" || true mount_line_of_mount_folder="$(echo "$mount_output" | grep "$mount_folder ")" || true
if echo "$mount_line_of_mount_folder" | grep --quiet "$new_mount_options" ; then if echo "$mount_line_of_mount_folder" | grep --quiet "$new_mount_options" ; then
$output_command "INFO: $mount_folder has already intended mount options." $output_command "INFO: $mount_folder has already intended mount options. ($new_mount_options)"
return 0 return 0
fi fi
if [ -e "$status_file_full_path" ]; then ## When this package is upgraded, the systemd unit will run again.
$output_command "INFO: $mount_folder already remounted earlier. Not remounting again." ## If the user meanwhile manually relaxed mount options, this should not be undone.
return 0
if [ "${1:-}" == "--force" ]; then
if [ -e "$status_file_full_path" ]; then
$output_command "INFO: $mount_folder already remounted earlier. Not remounting again. Use --force if this is what you want."
return 0
fi
fi fi
## BUG: echo: write error: Broken pipe ## BUG: echo: write error: Broken pipe
if echo "$mount_output" | grep --quiet "$mount_folder " ; then if echo "$mount_output" | grep --quiet "$mount_folder " ; then
## Already mounted. Using remount. ## Already mounted. Using remount.
$output_command mount -o "remount,${new_mount_options}" "$mount_folder" $output_command INFO: Executing: mount -o "remount,${new_mount_options}" "$mount_folder"
mount -o "remount,${new_mount_options}" "$mount_folder" || exit_code=100 mount -o "remount,${new_mount_options}" "$mount_folder" || exit_code=100
else else
## Not yet mounted. Using mount bind. ## Not yet mounted. Using mount bind.
$output_command mount -o "$new_mount_options" --bind "$mount_folder" "$mount_folder" $output_command INFO: Executing: mount -o "$new_mount_options" --bind "$mount_folder" "$mount_folder"
mount -o "$new_mount_options" --bind "$mount_folder" "$mount_folder" || exit_code=101 mount -o "$new_mount_options" --bind "$mount_folder" "$mount_folder" || exit_code=101
fi fi