diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-08-30 17:19:15 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-08-30 17:19:15 +0000 |
| commit | 9e9616cb41c1476dd4432c1c04666fd0560ba42e (patch) | |
| tree | 4060f6c9091d22c17a7aed4562ded968a1c85eed | |
| parent | 8d3a4aac9799b67fd172efb0907426a53f661176 (diff) | |
| download | drakx-backup-do-not-use-9e9616cb41c1476dd4432c1c04666fd0560ba42e.tar drakx-backup-do-not-use-9e9616cb41c1476dd4432c1c04666fd0560ba42e.tar.gz drakx-backup-do-not-use-9e9616cb41c1476dd4432c1c04666fd0560ba42e.tar.bz2 drakx-backup-do-not-use-9e9616cb41c1476dd4432c1c04666fd0560ba42e.tar.xz drakx-backup-do-not-use-9e9616cb41c1476dd4432c1c04666fd0560ba42e.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.pm | 2 | ||||
| -rw-r--r-- | perl-install/fs/mount.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 |
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(); |