Commit 18b65bf2 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'test/15379-adjust-to-python-upgrade-wrapper' into devel (Fix-committed: #15379)

parents 2b7e7da9 9052781b
......@@ -49,10 +49,10 @@ def persistent_volumes_mountpoints
def recover_from_upgrader_failure
$vm.execute('killall tails-upgrade-frontend tails-upgrade-frontend-wrapper zenity')
# Remove unnecessary sleep for retry
$vm.execute_successfully('sed -i "/^sleep 30$/d" ' +
$vm.execute('pkill --full tails-upgrade-frontend-wrapper')
$vm.execute('killall tails-upgrade-frontend zenity')
# Do not sleep when retrying
$vm.execute_successfully('/usr/local/bin/tails-upgrade-frontend-wrapper --no-wait')
$vm.spawn('tails-upgrade-frontend-wrapper', user: LIVE_USER)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment