summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-30 17:19:11 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-30 17:19:11 +0000
commit4c11c11f94e94c387628371a19b9a13afc0f781a (patch)
tree8c09cfa13e8f0aca6f20e7f824eeccfd32b67200 /perl-install/install
parentb51cc60cdc58d6dae7a0f4d8137c4e8c4403ff04 (diff)
downloaddrakx-4c11c11f94e94c387628371a19b9a13afc0f781a.tar
drakx-4c11c11f94e94c387628371a19b9a13afc0f781a.tar.gz
drakx-4c11c11f94e94c387628371a19b9a13afc0f781a.tar.bz2
drakx-4c11c11f94e94c387628371a19b9a13afc0f781a.tar.xz
drakx-4c11c11f94e94c387628371a19b9a13afc0f781a.zip
adapt to usbfs death (1/4): check for /sys/kernel/debug/usb instead of
/proc/bus/usb
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps.pm2
2 files changed, 3 insertions, 1 deletions
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