diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2000-12-17 23:32:50 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2000-12-17 23:32:50 +0000 |
| commit | e5b4ea994b4cf66d418494d33abd89300d291c6d (patch) | |
| tree | 7d8c840ea0a27814b53fa0a94c0a0d3fa92ae5c6 /mdk-stage1/stage1.c | |
| parent | 2766c6bb69ced7c4f33ec9d8bda56ba5b66e2915 (diff) | |
| download | drakx-backup-do-not-use-e5b4ea994b4cf66d418494d33abd89300d291c6d.tar drakx-backup-do-not-use-e5b4ea994b4cf66d418494d33abd89300d291c6d.tar.gz drakx-backup-do-not-use-e5b4ea994b4cf66d418494d33abd89300d291c6d.tar.bz2 drakx-backup-do-not-use-e5b4ea994b4cf66d418494d33abd89300d291c6d.tar.xz drakx-backup-do-not-use-e5b4ea994b4cf66d418494d33abd89300d291c6d.zip | |
automatic mode added (a.k.a get rid of redhat kickstart)
Diffstat (limited to 'mdk-stage1/stage1.c')
| -rw-r--r-- | mdk-stage1/stage1.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 4f72ab9d1..528132ace 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -42,6 +42,7 @@ #include "frontend.h" #include "modules.h" #include "tools.h" +#include "automatic.h" #ifndef DISABLE_CDROM #include "cdrom.h" @@ -110,37 +111,38 @@ void spawn_shell(void) enum return_type method_select_and_prepare(void) { + enum return_type results; + char * choice; + char * means[10], * means_auto[10]; + int i; + #ifndef DISABLE_DISK - char * disk_install = "Hard disk"; + char * disk_install = "Hard disk"; char * disk_install_auto = "disk"; #endif #ifndef DISABLE_CDROM - char * cdrom_install = "CDROM drive"; + char * cdrom_install = "CDROM drive"; char * cdrom_install_auto = "cdrom"; #endif #ifndef DISABLE_NETWORK - char * network_nfs_install = "NFS server"; - char * network_ftp_install = "FTP server"; - char * network_http_install = "HTTP server"; + char * network_nfs_install = "NFS server"; char * network_nfs_install_auto = "nfs"; + char * network_ftp_install = "FTP server"; char * network_ftp_install_auto = "ftp"; + char * network_http_install = "HTTP server"; char * network_http_install_auto = "http"; #endif - enum return_type results; - char * choice; - char * means[10]; - int i; i = 0; #ifndef DISABLE_NETWORK - means[i] = network_nfs_install; i++; - means[i] = network_ftp_install; i++; - means[i] = network_http_install; i++; -#endif -#ifndef DISABLE_DISK - means[i] = disk_install; i++; + means[i] = network_nfs_install; means_auto[i++] = network_nfs_install_auto; + means[i] = network_ftp_install; means_auto[i++] = network_ftp_install_auto; + means[i] = network_http_install; means_auto[i++] = network_http_install_auto; #endif #ifndef DISABLE_CDROM - means[i] = cdrom_install; i++; + means[i] = cdrom_install; means_auto[i++] = cdrom_install_auto; +#endif +#ifndef DISABLE_DISK + means[i] = disk_install; means_auto[i++] = disk_install_auto; #endif means[i] = NULL; - results = ask_from_list("Please choose the mean of installation.", means, &choice); + results = ask_from_list_auto("Please choose the mean of installation.", means, &choice, "method", means_auto); if (results != RETURN_OK) return results; |