diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-02-21 16:23:30 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-02-21 16:23:30 +0000 |
| commit | b40ba78d0d3bd52d05893ec4ddd6b25643cee5ef (patch) | |
| tree | b92fbe582bc569147fb941c14ea2f8bb439df7d7 | |
| parent | a08287dd38daa8b5fca905ed79b49c6076980863 (diff) | |
| download | drakx-b40ba78d0d3bd52d05893ec4ddd6b25643cee5ef.tar drakx-b40ba78d0d3bd52d05893ec4ddd6b25643cee5ef.tar.gz drakx-b40ba78d0d3bd52d05893ec4ddd6b25643cee5ef.tar.bz2 drakx-b40ba78d0d3bd52d05893ec4ddd6b25643cee5ef.tar.xz drakx-b40ba78d0d3bd52d05893ec4ddd6b25643cee5ef.zip | |
add support for automatic (ex-kickstart) in disk installs
| -rw-r--r-- | mdk-stage1/disk.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index 3dbebd0ec..0a15f0e67 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -33,6 +33,7 @@ #include "log.h" #include "mount.h" #include "lomount.h" +#include "automatic.h" #include "disk.h" @@ -54,6 +55,7 @@ static char * disk_extract_list_directory(char * direct) static enum return_type try_with_device(char *dev_name) { char * questions_location[] = { "Directory or ISO image", NULL }; + char * questions_location_auto[] = { "directory", NULL }; static char ** answers_location = NULL; char device_fullname[50]; char location_full[500]; @@ -95,8 +97,8 @@ static enum return_type try_with_device(char *dev_name) return RETURN_ERROR; } - results = ask_from_list_comments("Please choose the partition where is copied the " DISTRIB_NAME " Distribution.", - parts, parts_comments, &choice); + results = ask_from_list_comments_auto("Please choose the partition where is copied the " DISTRIB_NAME " Distribution.", + parts, parts_comments, &choice, "partition", parts); if (results != RETURN_OK) return results; @@ -110,8 +112,8 @@ static enum return_type try_with_device(char *dev_name) return try_with_device(dev_name); } - if (ask_from_entries("Please enter the directory (or ISO image file) containing the " DISTRIB_NAME " Distribution.", - questions_location, &answers_location, 24, NULL) != RETURN_OK) { + if (ask_from_entries_auto("Please enter the directory (or ISO image file) containing the " DISTRIB_NAME " Distribution.", + questions_location, &answers_location, 24, questions_location_auto, NULL) != RETURN_OK) { umount(disk_own_mount); return try_with_device(dev_name); } @@ -218,7 +220,8 @@ enum return_type disk_prepare(void) return disk_prepare(); } - results = ask_from_list_comments("Please choose the DISK drive on which you copied the " DISTRIB_NAME " Distribution.", medias, medias_models, &choice); + results = ask_from_list_comments_auto("Please choose the DISK drive on which you copied the " DISTRIB_NAME " Distribution.", + medias, medias_models, &choice, "disk", medias); if (results != RETURN_OK) return results; |