From 5bb9f26b5fb58952b5e8dd86c95b7b783a4ca504 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 28 Jun 2019 12:53:33 -0700 Subject: [PATCH] Try and fix root password setting for ostree installs This is kind of a pain. I hope this works... Signed-off-by: Adam Williamson --- tests/_do_install_and_reboot.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index cce7ec70..4414a35b 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -132,7 +132,12 @@ sub run { assert_script_run "chroot /mnt/sysimage abrt-auto-reporting 1"; } if (grep {$_ eq 'rootpw'} @actions) { - assert_script_run "echo 'root:$root_password' | chpasswd -R /mnt/sysimage"; + my $mount = "/mnt/sysimage"; + if (get_var("CANNED")) { + # finding the actual host system root is fun for ostree... + $mount = "/mnt/sysimage/ostree/deploy/fedora/deploy/*.?"; + } + assert_script_run "echo 'root:$root_password' | chpasswd -R $mount"; } type_string "reboot\n" if (grep {$_ eq 'reboot'} @actions); }