Mageia Bugzilla – Attachment 2697 Details for
Bug 7248
Input devices are dead at begin of iso install (Mageia 3 Alpha 1)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
more changes for stage2
usb.diff (text/plain), 4.48 KB, created by
Thierry Vignaud
on 2012-08-30 15:17:32 CEST
(
hide
)
Description:
more changes for stage2
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2012-08-30 15:17:32 CEST
Size:
4.48 KB
patch
obsolete
>diff -up ./any.pm.tv ./any.pm >--- ./any.pm.tv 2012-08-30 14:56:14.798158994 +0200 >+++ ./any.pm 2012-08-30 14:58:05.921383697 +0200 >@@ -1290,7 +1290,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 -up ./detect_devices.pm.tv ./detect_devices.pm >--- ./detect_devices.pm.tv 2012-08-30 14:56:14.800158996 +0200 >+++ ./detect_devices.pm 2012-08-30 14:58:25.835423965 +0200 >@@ -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; >@@ -1266,6 +1266,7 @@ sub has_53c94() { find { /53c94/ } al > sub usbKeyboard2country_code { > my ($usb_kbd) = @_; > my ($F, $tmp); >+ # FIXME: usbfs is dead! > sysopen($F, sprintf("/proc/bus/usb/%03d/%03d", $usb_kbd->{pci_bus}, $usb_kbd->{pci_device}), 0) and > sysseek $F, 0x28, 0 and > sysread $F, $tmp, 1 and >diff -up ./fs/any.pm.tv ./fs/any.pm >--- ./fs/any.pm.tv 2012-08-30 15:01:46.763830119 +0200 >+++ ./fs/any.pm 2012-08-30 15:01:24.644785413 +0200 >@@ -96,7 +96,6 @@ 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) }; > } > > sub getAvailableSpace { >diff -up ./fs/mount.pm.tv ./fs/mount.pm >--- ./fs/mount.pm.tv 2012-08-30 14:56:14.804159008 +0200 >+++ ./fs/mount.pm 2012-08-30 15:01:12.708761285 +0200 >@@ -36,7 +36,7 @@ sub mount { > > { > my @fs_modules = qw(btrfs ext3 ext4 hfs jfs nilfs2 nfs ntfs romfs reiserfs ufs xfs vfat); >- my @types = (qw(ext2 proc sysfs usbfs usbdevfs iso9660 devpts auto ntfs-3g), @fs_modules); >+ my @types = (qw(ext2 proc sysfs usbdevfs iso9660 devpts auto ntfs-3g), @fs_modules); > > push @types, 'smb', 'cifs', 'davfs2' if !$::isInstall; > >@@ -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 -up ./install/install2.pm.tv ./install/install2.pm >--- ./install/install2.pm.tv 2012-08-30 14:56:14.806159011 +0200 >+++ ./install/install2.pm 2012-08-30 15:00:50.500716399 +0200 >@@ -331,7 +331,7 @@ sub init_local_install { > push @::auto_steps, > # 'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass', > 'doPartitionDisks', 'formatPartitions'; >- fs::mount::usbfs(''); >+ fs::mount::sys_kernel_debug(''); > $o->{nomouseprobe} = 1; > $o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice'); > } >diff -up ./install/steps_interactive.pm.tv ./install/steps_interactive.pm >diff -up ./install/steps.pm.tv ./install/steps.pm >--- ./install/steps.pm.tv 2012-08-30 14:56:14.811159021 +0200 >+++ ./install/steps.pm 2012-08-30 14:58:05.926383706 +0200 >@@ -178,7 +178,7 @@ sub doPartitionDisksBefore { > my ($o) = @_; > eval { > eval { fs::mount::umount("$::prefix/sys") }; >- eval { fs::mount::umount("$::prefix/proc/bus/usb") }; >+ eval { fs::mount::umount("$::prefix/sys/kernel/debug/usb") }; > eval { fs::mount::umount("$::prefix/proc") }; > eval { fs::mount::umount_all($o->{fstab}) }; > eval { sleep 1; fs::mount::umount_all($o->{fstab}) } if $@; >diff -up ./modules/interactive.pm.tv ./modules/interactive.pm >diff -up ./modules.pm.tv ./modules.pm >--- ./modules.pm.tv 2012-08-30 14:56:14.802159003 +0200 >+++ ./modules.pm 2012-08-30 15:00:38.878692911 +0200 >@@ -282,8 +282,8 @@ 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 { >- require fs::mount; fs::mount::usbfs(''); >+ -f '/sys/kernel/debug/usb/devices' or eval { >+ require fs::mount; fs::mount::sys_kernel_debug(''); > > sleep 4; > load("usbhid") if detect_devices::usbKeyboards();
diff -up ./any.pm.tv ./any.pm --- ./any.pm.tv 2012-08-30 14:56:14.798158994 +0200 +++ ./any.pm 2012-08-30 14:58:05.921383697 +0200 @@ -1290,7 +1290,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 -up ./detect_devices.pm.tv ./detect_devices.pm --- ./detect_devices.pm.tv 2012-08-30 14:56:14.800158996 +0200 +++ ./detect_devices.pm 2012-08-30 14:58:25.835423965 +0200 @@ -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; @@ -1266,6 +1266,7 @@ sub has_53c94() { find { /53c94/ } al sub usbKeyboard2country_code { my ($usb_kbd) = @_; my ($F, $tmp); + # FIXME: usbfs is dead! sysopen($F, sprintf("/proc/bus/usb/%03d/%03d", $usb_kbd->{pci_bus}, $usb_kbd->{pci_device}), 0) and sysseek $F, 0x28, 0 and sysread $F, $tmp, 1 and diff -up ./fs/any.pm.tv ./fs/any.pm --- ./fs/any.pm.tv 2012-08-30 15:01:46.763830119 +0200 +++ ./fs/any.pm 2012-08-30 15:01:24.644785413 +0200 @@ -96,7 +96,6 @@ 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) }; } sub getAvailableSpace { diff -up ./fs/mount.pm.tv ./fs/mount.pm --- ./fs/mount.pm.tv 2012-08-30 14:56:14.804159008 +0200 +++ ./fs/mount.pm 2012-08-30 15:01:12.708761285 +0200 @@ -36,7 +36,7 @@ sub mount { { my @fs_modules = qw(btrfs ext3 ext4 hfs jfs nilfs2 nfs ntfs romfs reiserfs ufs xfs vfat); - my @types = (qw(ext2 proc sysfs usbfs usbdevfs iso9660 devpts auto ntfs-3g), @fs_modules); + my @types = (qw(ext2 proc sysfs usbdevfs iso9660 devpts auto ntfs-3g), @fs_modules); push @types, 'smb', 'cifs', 'davfs2' if !$::isInstall; @@ -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 -up ./install/install2.pm.tv ./install/install2.pm --- ./install/install2.pm.tv 2012-08-30 14:56:14.806159011 +0200 +++ ./install/install2.pm 2012-08-30 15:00:50.500716399 +0200 @@ -331,7 +331,7 @@ sub init_local_install { push @::auto_steps, # 'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass', 'doPartitionDisks', 'formatPartitions'; - fs::mount::usbfs(''); + fs::mount::sys_kernel_debug(''); $o->{nomouseprobe} = 1; $o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice'); } diff -up ./install/steps_interactive.pm.tv ./install/steps_interactive.pm diff -up ./install/steps.pm.tv ./install/steps.pm --- ./install/steps.pm.tv 2012-08-30 14:56:14.811159021 +0200 +++ ./install/steps.pm 2012-08-30 14:58:05.926383706 +0200 @@ -178,7 +178,7 @@ sub doPartitionDisksBefore { my ($o) = @_; eval { eval { fs::mount::umount("$::prefix/sys") }; - eval { fs::mount::umount("$::prefix/proc/bus/usb") }; + eval { fs::mount::umount("$::prefix/sys/kernel/debug/usb") }; eval { fs::mount::umount("$::prefix/proc") }; eval { fs::mount::umount_all($o->{fstab}) }; eval { sleep 1; fs::mount::umount_all($o->{fstab}) } if $@; diff -up ./modules/interactive.pm.tv ./modules/interactive.pm diff -up ./modules.pm.tv ./modules.pm --- ./modules.pm.tv 2012-08-30 14:56:14.802159003 +0200 +++ ./modules.pm 2012-08-30 15:00:38.878692911 +0200 @@ -282,8 +282,8 @@ 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 { - require fs::mount; fs::mount::usbfs(''); + -f '/sys/kernel/debug/usb/devices' or eval { + require fs::mount; fs::mount::sys_kernel_debug(''); sleep 4; load("usbhid") if detect_devices::usbKeyboards();
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 7248
:
2694
|
2695
| 2697