From 25f813a6dc6e131dc0a10d95c39f4253618f3f98 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 24 May 2012 19:04:29 +0000 Subject: (beforeInstallPackages) simplify --- perl-install/install/steps.pm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'perl-install/install') diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 1d0822dee..9e8909535 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -372,17 +372,13 @@ sub beforeInstallPackages { cp_af("/etc/resolv.conf", "$::prefix/etc"); } - if (-e '/tmp/.X11-unix') { - mkdir "$::prefix/tmp/.X11-unix"; - run_program::run('mount', '--bind', '/tmp/.X11-unix', "$::prefix/tmp/.X11-unix"); - } - - if (-e '/run') { - mkdir "$::prefix/run"; - run_program::run('mount', '--bind', '/run', "$::prefix/run"); + foreach ('/run', '/tmp/.X11-unix') { + if (-e $_) { + mkdir "$::prefix/$_"; + run_program::run('mount', '--bind', $_, "$::prefix/$_"); + } } - log::l("setting excludedocs to $o->{excludedocs}"); substInFile { s/%_excludedocs.*//; $_ .= "%_excludedocs yes\n" if eof && $o->{excludedocs} } "$::prefix/etc/rpm/macros"; -- cgit v1.2.1