From 9e9616cb41c1476dd4432c1c04666fd0560ba42e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 30 Aug 2012 17:19:15 +0000
Subject: adapt to usbfs death (2/4): if needed, mount /sys/kernel/debug/usb
 instead of /proc/bus/usb

---
 perl-install/fs/any.pm           | 2 +-
 perl-install/fs/mount.pm         | 5 ++---
 perl-install/install/install2.pm | 2 +-
 perl-install/modules.pm          | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index 12aab35ca..bba86ecd2 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -96,7 +96,7 @@ sub prepare_minimal_root() {
     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) };
+    eval { fs::mount::sys_kernel_debug($::prefix) };
 }
 
 sub getAvailableSpace {
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm
index 0bff5f06c..58d2e41ff 100644
--- a/perl-install/fs/mount.pm
+++ b/perl-install/fs/mount.pm
@@ -225,11 +225,10 @@ sub umount_all {
     }
 }
 
-sub usbfs {
+sub sys_kernel_debug {
     my ($prefix) = @_;
     
-    my $fs = cat_('/proc/filesystems') =~ /usbfs/ ? 'usbfs' : 'usbdevfs';
-    mount('none', "$prefix/proc/bus/usb", $fs);
+    mount('none', "$prefix/sys/kernel/debug/usb", 'debugfs');
 }
 
 1;
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 15ccc7604..1bd3fcefe 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -331,7 +331,7 @@ sub init_local_install {
     push @::auto_steps, 
 #      'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass',
       'doPartitionDisks', 'formatPartitions';
-	fs::mount::usbfs(''); #- do it now so that when_load doesn't do it
+	fs::mount::sys_kernel_debug('');  #- do it now so that when_load doesn't do it
 	$o->{nomouseprobe} = 1;
 	$o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice');
 }
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 593bc7719..6014c6dc6 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -283,7 +283,7 @@ sub when_load_category {
     } elsif ($category eq 'bus/usb') {
 	$conf->add_probeall('usb-interface', $name);
         -f '/sys/kernel/debug/usb/devices' or eval {
-            require fs::mount; fs::mount::usbfs('');
+            require fs::mount; fs::mount::sys_kernel_debug('');
             #- ensure keyboard is working, the kernel must do the job the BIOS was doing
             sleep 4;
             load("usbhid") if detect_devices::usbKeyboards();
-- 
cgit v1.2.1