From ee1a64bdbd11691d9ab112557f61bd9de0e3f97a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 10 Aug 2004 07:58:25 +0000
Subject: mount /proc, /sys and /proc/usb/usb in $prefix ASAP instead of doing
 it at various places

---
 perl-install/bootloader.pm   | 1 -
 perl-install/install2.pm     | 4 ++++
 perl-install/network/adsl.pm | 6 ------
 perl-install/pkgs.pm         | 3 ---
 4 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 809f87acc..632766b66 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -828,7 +828,6 @@ sub set_profiles {
 sub get_of_dev {
     my ($unix_dev) = @_;
 
-    eval { fs::mount('none', '$::prefix/sys', 'sysfs', 0) } if -d "$::prefix/sys/devices";
     devices::make("$::prefix$unix_dev");
 
     my $of_dev;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 2d6be8961..4463aaff2 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -186,6 +186,10 @@ sub formatPartitions {
     devices::make("$o->{prefix}/dev/null");
     chmod 0666, "$o->{prefix}/dev/null";
 
+    eval { fs::mount('none', "$o->{prefix}/proc", 'proc') };
+    eval { fs::mount('none', "$o->{prefix}/proc/bus/usb", 'usbdevfs') };
+    eval { fs::mount('none', "$o->{prefix}/sys", 'sysfs') };
+
     common::screenshot_dir__and_move();
 
     any::rotate_logs($o->{prefix});
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 77dba84a5..a47fde34e 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -319,12 +319,6 @@ TYPE=$kind
     write_cnx_script($netc);
 
     unless ($::isStandalone) {
-        #- proc and usbdevfs need to be mounted for external start commands
-        $::isInstall && eval {
-            require fs;
-            fs::mount("/proc", "$::prefix/proc", 'proc') if !-f "$::prefix/proc/mounts";
-            fs::mount('none', "$::prefix/proc/bus/usb", 'usbdevfs');
-        } or log::l("failed to mount usbdevfs");
         my @modules = (@{$modems{$adsl_device}{modules}}, map { $_->[1] } @{$modems{$adsl_device}{aliases}});
         @modules && eval { modules::load(@modules) }
           or log::l("failed to load " . join(',', @modules), " modules: $@");
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index a97b2ed3e..2fb31c834 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -1016,7 +1016,6 @@ sub install($$$;$$) {
 
     log::l("pkgs::install $prefix");
     log::l("pkgs::install the following: ", join(" ", map { $_->name } values %packages));
-    eval { fs::mount("/proc", "$prefix/proc", "proc", 0) } unless -e "$prefix/proc/cpuinfo";
 
     URPM::read_config_files();
     my $LOG = openInstallLog($prefix);
@@ -1236,8 +1235,6 @@ sub remove {
 	$trans->remove($p);
     }
 
-    eval { fs::mount("/proc", "$prefix/proc", "proc", 0) } unless -e "$prefix/proc/cpuinfo";
-
     #- we are not checking depends since it should come when
     #- upgrading a system. although we may remove some functionalities ?
 
-- 
cgit v1.2.1