Skip to content

switch to r/w if /boot/efi is r/o #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jiri-belka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

switch to r/w if /boot/efi is r/o #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions grub2-efi/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ if [ "$SYS__BOOTLOADER__UPDATE_NVRAM" = "no" ] ; then
append="$append --no-nvram"
fi

lib_switch_efi_mount_dir_ro_rw pre

if [ "$SYS__BOOTLOADER__SECURE_BOOT" = "yes" -a -x /usr/sbin/shim-install ] ; then
( set -x ; /usr/sbin/shim-install --config-file=/boot/grub2/grub.cfg $append )
elif [ -x /usr/sbin/grub2-install ] ; then
Expand Down Expand Up @@ -151,6 +153,7 @@ else
exit 1
fi

lib_switch_efi_mount_dir_ro_rw post
err=$?

lib_efi_log_boot_entry
Expand Down
27 changes: 27 additions & 0 deletions include/library
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,3 +405,30 @@ lib_get_default_kernel_initrd ()
return
done
}

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# lib_switch_efi_mount_dir_ro_rw
#
# Switch $efi_mount_dir filesystem ro/rw modes
#
lib_switch_efi_mount_dir_ro_rw ()
{
local action=$1

lib_get_efi_mount_dir

case "$action" in
pre)
if findmnt -no OPTIONS "$efi_mount_dir" | tr ',' '\n' | grep -q '^ro$' ; then
mount -o remount,rw "$efi_mount_dir"
fi
;;
post)
mode=$(awk -v efi_mount_dir="$efi_mount_dir" \
'$2 == efi_mount_dir { print $4 }' /etc/fstab | tr ',' '\n' | grep '^ro')
if [ -n "$mode" ]; then
mount -o remount,"$mode" "$efi_mount_dir"
fi
;;
esac
}