diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-10-14 22:47:12 +0200 |
---|---|---|
committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-10-14 22:47:38 +0200 |
commit | 6f4abb80806af4349ed9d90055c4024654678caf (patch) | |
tree | ef40e998644acec3016039c59e6409f62d5330ce /iurt | |
parent | f4aa386cde5cd682eb563463c1a52950bb0e8dc8 (diff) | |
download | iurt-6f4abb80806af4349ed9d90055c4024654678caf.tar iurt-6f4abb80806af4349ed9d90055c4024654678caf.tar.gz iurt-6f4abb80806af4349ed9d90055c4024654678caf.tar.bz2 iurt-6f4abb80806af4349ed9d90055c4024654678caf.tar.xz iurt-6f4abb80806af4349ed9d90055c4024654678caf.zip |
kill doble if
this has just been tested a couple lines above
introduced in commit 0e788a7b17282b7539d652542c87afe06d48efd9
Diffstat (limited to 'iurt')
-rwxr-xr-x | iurt | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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 |