summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-30 17:19:15 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-30 17:19:15 +0000
commit446202f3261911c59e194d9883e4618753a0e5b7 (patch)
tree4060f6c9091d22c17a7aed4562ded968a1c85eed
parent4c11c11f94e94c387628371a19b9a13afc0f781a (diff)
downloaddrakx-446202f3261911c59e194d9883e4618753a0e5b7.tar
drakx-446202f3261911c59e194d9883e4618753a0e5b7.tar.gz
drakx-446202f3261911c59e194d9883e4618753a0e5b7.tar.bz2
drakx-446202f3261911c59e194d9883e4618753a0e5b7.tar.xz
drakx-446202f3261911c59e194d9883e4618753a0e5b7.zip
adapt to usbfs death (2/4): if needed, mount /sys/kernel/debug/usb
instead of /proc/bus/usb
-rw-r--r--perl-install/fs/any.pm2
-rw-r--r--perl-install/fs/mount.pm5
-rw-r--r--perl-install/install/install2.pm2
-rw-r--r--perl-install/modules.pm2
4 files changed, 5 insertions, 6 deletions
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();