From 6f4abb80806af4349ed9d90055c4024654678caf Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 14 Oct 2016 22:47:12 +0200 Subject: kill doble if this has just been tested a couple lines above introduced in commit 0e788a7b17282b7539d652542c87afe06d48efd9 --- iurt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/iurt b/iurt index f16d22f..b19a94f 100755 --- a/iurt +++ b/iurt @@ -697,11 +697,10 @@ if ($run{shell}) { $urpmi->install_packages('chroot', $chroot_tmp, $local_spool, \%pack_provide, 'configure', "[ADMIN] installation of urpmi and sudo failed in the chroot $run{my_arch}", { check => 1, maintainer => $config->{admin} }, 'urpmi', 'sudo') or die "FATAL $program_name: could not add urpmi and sudo in the chroot"; add_sudoers($chroot_tmp, $luser); - if ($run{shell}) { - plog('NOTIFY', "dumping to a chrooted shell into $chroot_tmp"); - exec $sudo, $config->{iurt_root_command}, '--chroot', $chroot_tmp, '/bin/su', '-', $luser, '-c', "$config->{prompt} bash"; - die "FATAL $program_name: could not exec chroot to $chroot_tmp ($!)"; - } + + plog('NOTIFY', "dumping to a chrooted shell into $chroot_tmp"); + exec $sudo, $config->{iurt_root_command}, '--chroot', $chroot_tmp, '/bin/su', '-', $luser, '-c', "$config->{prompt} bash"; + die "FATAL $program_name: could not exec chroot to $chroot_tmp ($!)"; } # If not using --shell or --stop, we don't want an interactive build -- cgit v1.2.1