From 4c11c11f94e94c387628371a19b9a13afc0f781a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 30 Aug 2012 17:19:11 +0000
Subject: adapt to usbfs death (1/4): check for /sys/kernel/debug/usb instead
 of /proc/bus/usb

---
 perl-install/install/NEWS     | 2 ++
 perl-install/install/steps.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e722cb1da..4f2e44bd1 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- adapt to usbfs death
+
 Version 14.34 - 30 August 2012
 
 - adapt to perl-5.16.1
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 9e8909535..802267102 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -177,8 +177,8 @@ sub selectInstallClass {
 sub doPartitionDisksBefore {
     my ($o) = @_;
     eval { 
+	eval { fs::mount::umount("$::prefix/sys/kernel/debug/usb") };
 	eval { fs::mount::umount("$::prefix/sys") };
-	eval { fs::mount::umount("$::prefix/proc/bus/usb") };
 	eval { fs::mount::umount("$::prefix/proc") };
 	eval {          fs::mount::umount_all($o->{fstab}) };
 	eval { sleep 1; fs::mount::umount_all($o->{fstab}) } if $@; #- HACK
-- 
cgit v1.2.1