summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry.Vignaud <thierry.vignaud@gmail.com>2014-06-18 15:58:28 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-06-18 22:40:47 +0200
commitacc4048b8314395a3d43cce48ebc8d28b136b1f9 (patch)
treefa16e203fba2a047d769ffae4c24a8886a1c1498
parentf0accd325010cdaadeb2b1d28ace036261f1d058 (diff)
downloaddrakx-acc4048b8314395a3d43cce48ebc8d28b136b1f9.tar
drakx-acc4048b8314395a3d43cce48ebc8d28b136b1f9.tar.gz
drakx-acc4048b8314395a3d43cce48ebc8d28b136b1f9.tar.bz2
drakx-acc4048b8314395a3d43cce48ebc8d28b136b1f9.tar.xz
drakx-acc4048b8314395a3d43cce48ebc8d28b136b1f9.zip
don't bother creating /dev/null
We mount --bind /dev on $::prefix/dev just after... Should have been done in commit 0e175066e7b21b48285d28afe85493664a0c2a8a Also restore comment & fix it.
-rw-r--r--perl-install/fs/any.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index fb80a32fc..a6666c737 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -79,15 +79,13 @@ sub create_minimal_files() {
etc/sysconfig/console/consoletrans
home mnt run tmp var var/tmp var/lib var/lib/rpm var/lib/urpmi);
mkdir "$::prefix/$_", 0700 foreach qw(root root/tmp root/drakx);
-
- devices::make("$::prefix/dev/null");
- chmod 0666, "$::prefix/dev/null";
}
sub prepare_minimal_root() {
fs::any::create_minimal_files();
+ # ensure we've all needed devices, for bootloader install and mkinitrd:
run_program::run('mount', '--bind', '/dev', "$::prefix/dev");
run_program::run('mount', '--bind', '/run', "$::prefix/run");
eval { fs::mount::mount('none', "$::prefix/proc", 'proc') };