Skip to content

Commit

Permalink
test: Don't encrypt/move the EFI partition in encrypt_root
Browse files Browse the repository at this point in the history
Doing that messes up the kernel's mount state, and eventually mounts the
new /boot *on top of* the old /boot and /boot/efi. This results in
/boot/efi not being umountable any more, and hanging forever during
shutdown on waiting for boot-efi.mount to finish stopping.
  • Loading branch information
martinpitt committed Aug 29, 2023
1 parent ab17855 commit 1d80bfe
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions test/common/storagelib.py
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,8 @@ def encrypt_root(self, passphrase):
mkdir /new-root
mount /dev/root/root /new-root
mkfs.ext4 {dev}1
# don't move the EFI partition
if mountpoint /boot/efi; then umount /boot/efi; fi
mkdir /new-root/boot
mount {dev}1 /new-root/boot
tar --selinux --one-file-system -cf - --exclude /boot --exclude='/var/tmp/*' --exclude='/var/cache/*' \
Expand Down

0 comments on commit 1d80bfe

Please sign in to comment.