Skip to content

qubes-dom0-update could check whether /boot is mounted #159

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

Merged
marmarek merged 1 commit into from
Jun 28, 2024
Merged

qubes-dom0-update could check whether /boot is mounted #159

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
43 changes: 43 additions & 0 deletions dom0-updates/qubes-dom0-update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ if [ "$1" = "--help" ]; then
echo " --console does nothing; ignored for backward compatibility"
echo " --show-output does nothing; ignored for backward compatibility"
echo " --preserve-terminal does nothing; ignored for backward compatibility"
echo " --skip-boot-check does not check if /boot & /boot/efi should be mounted"
echo " --switch-audio-server-to=(pulseaudio|pipewire) switch audio daemon to pipewire or pulseaudio"
echo " it will be done after requested action (update by default)"
echo " <pkg list> download (and install if run by root) new packages"
Expand All @@ -53,6 +54,7 @@ FORCE_XEN_UPGRADE=
REBOOT_REQUIRED=
DOWNLOADONLY=
AUDIO_SWITCH=
SKIP_BOOT_CHECK=
# Filter out some dnf options and collect packages list
while [ $# -gt 0 ]; do
case "$1" in
Expand Down Expand Up @@ -102,6 +104,9 @@ while [ $# -gt 0 ]; do
YUM_ACTION=${1#--action=}
UPDATEVM_OPTS+=( "$1" )
;;
--skip-boot-check)
SKIP_BOOT_CHECK=1
;;
--)
if [[ "$#" -gt 1 ]]; then
YUM_OPTS+=( "${@:2}" )
Expand Down Expand Up @@ -234,6 +239,44 @@ if [ -n "$CLEAN" ]; then
fi
rm -f /var/lib/qubes/updates/errors

# Synopsis: check_mounted MOUNTPOINT
check_mounted() {
local CHOICE
# No reason to check further if mount point is already mounted
awk -v PART="${1}" '{if ($2 == PART ) { exit 0 }} ENDFILE{exit -1}' < /proc/mounts
[[ ${?} -ne 0 ]] || return
# No reason to check further if mount point is not in fstab
awk -v PART="${1}" '!/^[ \t]*#/{ if ( $2 == PART ) { exit 0}} ENDFILE {exit -1}' < /etc/fstab
[[ ${?} -ne 0 ]] && return
# Ask user to manually mount partition if user is using GUI Updater
if [ ! -t 1 ]; then
echo "Could not decide about unmounted ${1} partition in non-interactive/GUI mode!"

@marmarek marmarek Jun 26, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't allow overriding the check in non-interactive case. Maybe add some option for that?

@alimirjamali alimirjamali Jun 26, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't allow overriding the check in non-interactive case. Maybe add some option for that?

Is --skip-boot or --skip-boot-check or --skip-boot-upgrade good? And the help text:

--skip-boot       do no check if /boot & /boot/efi partitions are mounted.

echo "Please mount ${1} manually before proceeding with updates or update via CLI."
exit 1
fi
read -p "${1} partition is not mounted! mount it now? (y)es, (n)o, (a)bort operation " CHOICE
case ${CHOICE} in
y|Y)
mount "${1}"
if [[ ${?} -ne 0 ]]; then
echo "Mounting of ${1} was unsuccessful! aborting."
exit 1
fi
;;
n|N) echo "Warning! Proceeding forward without mounting ${1}";;
a|A) echo Operation aborted!; exit 1;;
*) echo Invalid choice. Aborting!; exit 1;;
esac
}

if [ "$SKIP_BOOT_CHECK" != "1" ] && [ "$CHECK_ONLY" != "1" ] && \
[ "$REMOTE_ONLY" != "1" ] && [ "$DOWNLOADONLY" != "1" ]; then
# Check if /boot is mounted on split root systems
check_mounted "/boot"
# Check if efi partition is mounted on UEFI systems
[ -d /sys/firmware/efi ] && check_mounted "/boot/efi"
fi

echo "Using $UPDATEVM as UpdateVM to download updates for Dom0; this may take some time..." >&2

# qvm-run by default auto-starts the VM if not running
Expand Down