diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2018-01-20 21:51:55 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2018-01-20 22:02:10 +0000 |
| commit | 18e0d250179de2f06bc2e7980b081d0b257cc069 (patch) | |
| tree | c7760ec91116c7de36b97f449baf3725651336a0 /perl-install/install | |
| parent | 9d1b6921f10392d02ca9f2c278272af910e923f3 (diff) | |
| download | drakx-18e0d250179de2f06bc2e7980b081d0b257cc069.tar drakx-18e0d250179de2f06bc2e7980b081d0b257cc069.tar.gz drakx-18e0d250179de2f06bc2e7980b081d0b257cc069.tar.bz2 drakx-18e0d250179de2f06bc2e7980b081d0b257cc069.tar.xz drakx-18e0d250179de2f06bc2e7980b081d0b257cc069.zip | |
Catch sys_kernel_debug failure for local install
Some systems (for example some virtual machines) don't have any
USB devices and the mounting fails as usbcore is not loaded.
This is the case for every other call of it and just means USB
devices don't get detected.
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/install2.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 77732524a..d84d8e61c 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix local install on systems without usb + Version 17.93 - 19 January 2018 - sync with kernel 4.14 diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index cf8ff7da8..de9ee5217 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -391,7 +391,7 @@ sub init_local_install { push @::auto_steps, # 'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass', 'doPartitionDisks', 'formatPartitions'; - fs::mount::sys_kernel_debug(''); #- do it now so that when_load doesn't do it + eval { fs::mount::sys_kernel_debug(''); }; #- do it now so that when_load doesn't do it $o->{nomouseprobe} = 1; $o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice'); } |