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 | 446202f3261911c59e194d9883e4618753a0e5b7 (patch) | |
| tree | 4060f6c9091d22c17a7aed4562ded968a1c85eed /perl-install/fs | |
| parent | 4c11c11f94e94c387628371a19b9a13afc0f781a (diff) | |
| download | drakx-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
Diffstat (limited to 'perl-install/fs')
| -rw-r--r-- | perl-install/fs/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/fs/mount.pm | 5 |
2 files changed, 3 insertions, 4 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; |