summaryrefslogtreecommitdiffstats
path: root/perl-install/install/steps.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-05-24 19:04:29 +0000
committerThierry Vignaud <tv@mageia.org>2012-05-24 19:04:29 +0000
commit8d6a21179727855a5c441a7190aed20d30397b43 (patch)
tree17ac71cdb698f5b3f6db28a83cda977e8de0a9ef /perl-install/install/steps.pm
parentef825e795da7ab1d7a6bd3b14e880ffc8f7cd6f4 (diff)
downloaddrakx-8d6a21179727855a5c441a7190aed20d30397b43.tar
drakx-8d6a21179727855a5c441a7190aed20d30397b43.tar.gz
drakx-8d6a21179727855a5c441a7190aed20d30397b43.tar.bz2
drakx-8d6a21179727855a5c441a7190aed20d30397b43.tar.xz
drakx-8d6a21179727855a5c441a7190aed20d30397b43.zip
(beforeInstallPackages) simplify
Diffstat (limited to 'perl-install/install/steps.pm')
-rw-r--r--perl-install/install/steps.pm14
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";