From 167bea908dd44c8adb9636eedce7838c517c5535 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 19 Feb 2021 13:58:11 -0800 Subject: [PATCH] Fix btrfs_preserve_home for UEFI and OFW (WIP) Signed-off-by: Adam Williamson --- tests/disk_custom_btrfs_preserve_home.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/disk_custom_btrfs_preserve_home.pm b/tests/disk_custom_btrfs_preserve_home.pm index bff41ddb..a76928e8 100644 --- a/tests/disk_custom_btrfs_preserve_home.pm +++ b/tests/disk_custom_btrfs_preserve_home.pm @@ -9,7 +9,10 @@ sub use_current_partition { my ($partition, $reformat) = @_; # Select the partition - assert_and_click "anaconda_part_select_$partition"; + my $match = $partition; + # needle names can't have / in them + $match =~ s,/,,; + assert_and_click "anaconda_part_select_$match"; # Select the mountpoint field send_key_until_needlematch("anaconda_part_mountpoint_selected", "tab", 20); # Type in the mountpoint @@ -46,6 +49,8 @@ sub run { use_current_partition("home", 0); # Use the boot partition from the current scheme use_current_partition("boot", 1); + # Use /boot/efi from current scheme, if we're EFI + use_current_partition("boot/efi", 1) if (get_var "UEFI"); # Select the root partition from the current scheme # and delete it