summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2012-05-05 17:37:33 +0000
committerColin Guthrie <colin@mageia.org>2012-05-05 17:37:33 +0000
commit0e175066e7b21b48285d28afe85493664a0c2a8a (patch)
tree08c553ebc0949e15a22265f813fba3268d62dcee
parenta28553b49f287f6e9359ea5d92105578d02626ef (diff)
downloaddrakx-0e175066e7b21b48285d28afe85493664a0c2a8a.tar
drakx-0e175066e7b21b48285d28afe85493664a0c2a8a.tar.gz
drakx-0e175066e7b21b48285d28afe85493664a0c2a8a.tar.bz2
drakx-0e175066e7b21b48285d28afe85493664a0c2a8a.tar.xz
drakx-0e175066e7b21b48285d28afe85493664a0c2a8a.zip
bind mount /dev inside chroot rather than copy nodes (mga#5730)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/any.pm5
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 42870a5be..d065f9904 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,8 @@
- harddrake service:
o do not disable cpufreq on non-laptops
o remove double apmd check
+- any.pm:
+ o bind mount /dev inside chroot rather than copy nodes (mga#5730)
Version 14.16 - 29 April 2012
diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index 431a22531..12aab35ca 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -6,6 +6,7 @@ use strict;
use common;
use fsedit;
use fs::mount_point;
+use run_program;
sub get_hds {
my ($all_hds, $fstab, $manual_fstab, $partitioning_flags, $skip_mtab, $o_in) = @_;
@@ -92,12 +93,10 @@ sub prepare_minimal_root() {
fs::any::create_minimal_files();
+ run_program::run('mount', '--bind', '/dev', "$::prefix/dev");
eval { fs::mount::mount('none', "$::prefix/proc", 'proc') };
eval { fs::mount::mount('none', "$::prefix/sys", 'sysfs') };
eval { fs::mount::usbfs($::prefix) };
-
- # copy all needed devices, for bootloader install and mkinitrd
- cp_af('/dev', $::prefix);
}
sub getAvailableSpace {