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/tools.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/tools.c')
-rw-r--r-- | mdk-stage1/tools.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c index d2ace065c..4f4bff8bb 100644 --- a/mdk-stage1/tools.c +++ b/mdk-stage1/tools.c @@ -102,7 +102,8 @@ void process_cmdline(void) params[param_number].value = value; param_number++; if (!strcmp(name, "changedisk")) set_param(MODE_CHANGEDISK); - if (!strcmp(name, "updatemodules")) set_param(MODE_UPDATEMODULES); + if (!strcmp(name, "updatemodules") || + !strcmp(name, "thirdparty")) set_param(MODE_THIRDPARTY); if (!strcmp(name, "rescue")) set_param(MODE_RESCUE); if (!strcmp(name, "keepmounted")) set_param(MODE_KEEP_MOUNTED); if (!strcmp(name, "noauto")) set_param(MODE_NOAUTO); @@ -452,7 +453,8 @@ int try_mount(char * dev, char * location) if (my_mount(device_fullname, location, "ext2", 0) == -1 && my_mount(device_fullname, location, "vfat", 0) == -1 && my_mount(device_fullname, location, "ntfs", 0) == -1 && - my_mount(device_fullname, location, "reiserfs", 0) == -1) { + my_mount(device_fullname, location, "reiserfs", 0) == -1 && + my_mount(device_fullname, location, "iso9660", 0) == -1) { return 1; } |