diff options
author | Olivier Blin <oblin@mandriva.org> | 2005-03-16 21:20:56 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.org> | 2005-03-16 21:20:56 +0000 |
commit | 5724d47cdd4a75af6ea347cecef43ed47b45a6d8 (patch) | |
tree | d0e855eb307b6441be4bcbff9137369ec4a9f162 /mdk-stage1/stage1.c | |
parent | 46ad4d816ac306866fbe2b9a1cb083e796204eac (diff) | |
download | drakx-5724d47cdd4a75af6ea347cecef43ed47b45a6d8.tar drakx-5724d47cdd4a75af6ea347cecef43ed47b45a6d8.tar.gz drakx-5724d47cdd4a75af6ea347cecef43ed47b45a6d8.tar.bz2 drakx-5724d47cdd4a75af6ea347cecef43ed47b45a6d8.tar.xz drakx-5724d47cdd4a75af6ea347cecef43ed47b45a6d8.zip |
- merge update_modules stuff in third-party module
- add "thirdparty" as an alias for the "updatemodules" option
- allow to specify thirdparty device using automatic "thirdparty" option
- try to mount as iso9660 too in try_mount
Diffstat (limited to 'mdk-stage1/stage1.c')
-rw-r--r-- | mdk-stage1/stage1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index b0c6979c5..a338c990b 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -585,8 +585,8 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) /* load usb interface as soon as possible, helps usb mouse detection in stage2 */ probe_that_type(USB_CONTROLLERS, BUS_USB); - if (IS_UPDATEMODULES) - update_modules(); + if (IS_THIRDPARTY) + thirdparty_load_modules(); #ifdef ENABLE_PCMCIA if (!IS_NOAUTO) |