summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-08-02 15:02:46 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-08-02 15:02:46 +0000
commitc126046bbdb898ed296230f19d7a398e1b0a2465 (patch)
tree18c7ba025f357477699f8080cc59a9424c40c7fb
parent6df138bc0f74b9d6869f69c9fb662f851026e6c8 (diff)
downloaddrakx-c126046bbdb898ed296230f19d7a398e1b0a2465.tar
drakx-c126046bbdb898ed296230f19d7a398e1b0a2465.tar.gz
drakx-c126046bbdb898ed296230f19d7a398e1b0a2465.tar.bz2
drakx-c126046bbdb898ed296230f19d7a398e1b0a2465.tar.xz
drakx-c126046bbdb898ed296230f19d7a398e1b0a2465.zip
- fix problem of clashing user/pass between adsl and ftp/http in case of automatic installs
- update doc on automatic install parameters (doc/TECH-INFOS)
-rw-r--r--mdk-stage1/adsl.c2
-rw-r--r--mdk-stage1/doc/TECH-INFOS91
2 files changed, 63 insertions, 30 deletions
diff --git a/mdk-stage1/adsl.c b/mdk-stage1/adsl.c
index a9107b5f9..d542f2f35 100644
--- a/mdk-stage1/adsl.c
+++ b/mdk-stage1/adsl.c
@@ -116,7 +116,7 @@ enum return_type perform_adsl(struct interface_info * intf)
{
struct in_addr addr;
char * questions[] = { "Username", "Password", NULL };
- char * questions_auto[] = { "user", "pass", NULL };
+ char * questions_auto[] = { "adsluser", "adslpass", NULL };
static char ** answers = NULL;
enum return_type results;
diff --git a/mdk-stage1/doc/TECH-INFOS b/mdk-stage1/doc/TECH-INFOS
index 563b97ee1..4ab1e485f 100644
--- a/mdk-stage1/doc/TECH-INFOS
+++ b/mdk-stage1/doc/TECH-INFOS
@@ -2,44 +2,77 @@
| (*) Automatic install
\----------------------
-This feature is used to replace redhat kickstart. I use the kernel
-parameter "automatic" with the following keywords:
+This feature is used to replace redhat kickstart. It uses the kernel
+parameter "automatic" with keywords separated with commas and colons, on
+the following genres:
-from list:
- method nfs, ftp, http, cdrom, disk
- network static, dhcp
- interface eth0, eth1, ..
+ automatic=method:nfs,network:static,ip:192.168.1.24,server:192.168.1.7,directory:/stable/i586
-giving (string) values:
- (static IP infos)
- ip
- dns
- gateway
- netmask
+ automatic=method:ftp,network:dhcp,server:ftp.ciril.fr,directory:/pub/linux/mandrake-devel/cooker
- (2nd step network config)
- hostname
- domain
+ automatic=method:ftp,interface:eth1,network:dhcp,...
- (3rd step nfs, ftp, http installs)
- server
- directory
+ automatic=method:ftp,network:adsl,adsluser:XXX,adslpass:XXX,...
- (3rd step ftp only)
- user
- pass
+ automatic=method:cdrom
- (2nd step disk install)
- disk
+ automatic=method:disk,disk:hdb,partition:hdb7
- (3rd step disk install)
- partition
- (4th step disk install)
- directory
+The keywords correspond to each "virtual" question answered automatically,
+either from a list or from a free field.
-Keywords must be passed with commas and colons, that is for example:
+Keywords are:
+
+
+`method' <- (nfs,ftp,http,cdrom,disk)
+
+if nfs/ftp/http:
+
+ `network' <- (static,dhcp,adsl)
+
+ if multiple interfaces detected:
+
+ `interface' <- (list-of-detected-interfaces)
+
+ fi
+
+ if static:
+
+ `ip', `dns', `gateway', `netmask' (free fields)
+
+ elsif adsl:
+
+ `adsluser', `adslpass' (free field)
+
+ fi
+
+ if resolving fails:
+
+ `hostname', `domain' (free fields)
+
+ fi
+
+ `server', `directory' (free fields)
+
+ if ftp:
+
+ `user', `pass' (free fields)
+
+ fi
+
+fi
+
+if disk:
+
+ `disk' <- (list-of-detected-disks)
+
+ `partition' <- (list-of-detected-partitions)
+
+ `directory' (free fields)
+
+fi
+
- automatic=method:nfs,network:static,ip:192.168.1.24,server:192.168.1.7,directory:/stable/i586