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/NEWS              | 1 +
 perl-install/any.pm            | 2 +-
 perl-install/detect_devices.pm | 2 +-
 perl-install/install/NEWS      | 2 ++
 perl-install/install/steps.pm  | 2 +-
 perl-install/modules.pm        | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 75441edee..537d721e2 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- adapt to usbfs death
 - drakxservices:
   o fix checking systemd presence after systemd merge of subpackages
 
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 6291e2d8b..1024bc4d0 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1289,7 +1289,7 @@ sub report_bug {
       header("lsmod"), cat_("/proc/modules"),
       header("cmdline"), cat_("/proc/cmdline"),
       header("pcmcia: stab"), cat_("$::prefix/var/lib/pcmcia/stab") || cat_("$::prefix/var/run/stab"),
-      header("usb"), cat_("/proc/bus/usb/devices"),
+      header("usb"), cat_("/sys/kernel/debug/usb/devices"),
       header("partitions"), cat_("/proc/partitions"),
       header("cpuinfo"), cat_("/proc/cpuinfo"),
       header("syslog"), cat_("/tmp/syslog") || cat_("$::prefix/var/log/syslog"),
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index cafc82e03..513800f3d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -867,7 +867,7 @@ sub pci_probe() {
 }
 
 sub usb_probe__real() {
-    -e "/proc/bus/usb/devices" or return;
+    -e "/sys/kernel/debug/usb/devices" or return;
 
     add_addons($usbtable_addons, map {
 	my %l;
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
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index c4c03fb34..593bc7719 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -282,7 +282,7 @@ sub when_load_category {
 	eval { load('sd_mod') };
     } elsif ($category eq 'bus/usb') {
 	$conf->add_probeall('usb-interface', $name);
-        -f '/proc/bus/usb/devices' or eval {
+        -f '/sys/kernel/debug/usb/devices' or eval {
             require fs::mount; fs::mount::usbfs('');
             #- ensure keyboard is working, the kernel must do the job the BIOS was doing
             sleep 4;
-- 
cgit v1.2.1