summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-31 15:28:32 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-31 15:28:32 +0000
commit1b40354efa4636e73b3151f66995210c4a76b81c (patch)
tree5bad597becd599a3b033b64896ca18749c16009c
parentdded16b2f7dea5232654a83dd68be87d7b92cb8e (diff)
downloaddrakx-1b40354efa4636e73b3151f66995210c4a76b81c.tar
drakx-1b40354efa4636e73b3151f66995210c4a76b81c.tar.gz
drakx-1b40354efa4636e73b3151f66995210c4a76b81c.tar.bz2
drakx-1b40354efa4636e73b3151f66995210c4a76b81c.tar.xz
drakx-1b40354efa4636e73b3151f66995210c4a76b81c.zip
do not set firmware timeout to 1 second in probe-modules helper for Mandriva One (#39216)
-rw-r--r--mdk-stage1/NEWS3
-rw-r--r--mdk-stage1/modules.c1
-rw-r--r--mdk-stage1/stage1.c1
3 files changed, 4 insertions, 1 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index c1c78e8f2..765466c7f 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,6 @@
+- do not set firmware timeout to 1 second in probe-modules helper for
+ Mandriva One (#39216)
+
1.26:
- load bus/firewire controllers (#31356)
- really ask dhcp domain if not guessed
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index 2f84ba405..dac88a214 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -243,7 +243,6 @@ static void init_firmware_timeout(void)
void init_modules_insmoding(void)
{
find_modules_directory();
- init_firmware_timeout();
if (load_modules_dependencies()) {
fatal_error("warning, error initing modules stuff, modules loading disabled");
}
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 5540e48f4..85865ab0c 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -408,6 +408,7 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
spawn_shell();
#endif
init_modules_insmoding();
+ init_firmware_timeout();
init_frontend("Welcome to " DISTRIB_DESCR ", " __DATE__ " " __TIME__);
/* load usb interface as soon as possible, helps usb mouse detection in stage2 */