diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-24 19:04:29 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-24 19:04:29 +0000 |
| commit | 25f813a6dc6e131dc0a10d95c39f4253618f3f98 (patch) | |
| tree | 17ac71cdb698f5b3f6db28a83cda977e8de0a9ef /perl-install | |
| parent | bab74ba720996283ca6373aafc97ae1076d97a9c (diff) | |
| download | drakx-backup-do-not-use-25f813a6dc6e131dc0a10d95c39f4253618f3f98.tar drakx-backup-do-not-use-25f813a6dc6e131dc0a10d95c39f4253618f3f98.tar.gz drakx-backup-do-not-use-25f813a6dc6e131dc0a10d95c39f4253618f3f98.tar.bz2 drakx-backup-do-not-use-25f813a6dc6e131dc0a10d95c39f4253618f3f98.tar.xz drakx-backup-do-not-use-25f813a6dc6e131dc0a10d95c39f4253618f3f98.zip | |
(beforeInstallPackages) simplify
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/steps.pm | 14 |
1 files changed, 5 insertions, 9 deletions
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"; |