[arch-releng] [PATCH 3/3] Call launch_interactive_shell in more cases of error.