diff options
| author | Erik Troan <ewt@redhat.com> | 1999-09-06 14:19:44 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 1999-09-06 14:19:44 +0000 |
| commit | 8acbd990cb6061f9bfcf80f81d6d342bca6f850d (patch) | |
| tree | 4907de9539ff713829ddb4c20fe128709fe68390 | |
| parent | b932e15cc201da60b3b6b5332dd052c7efb040d7 (diff) | |
| download | anaconda-8acbd990cb6061f9bfcf80f81d6d342bca6f850d.tar.gz anaconda-8acbd990cb6061f9bfcf80f81d6d342bca6f850d.tar.xz anaconda-8acbd990cb6061f9bfcf80f81d6d342bca6f850d.zip | |
added text directive for kickstart
| -rw-r--r-- | loader/kickstart.c | 1 | ||||
| -rw-r--r-- | loader/kickstart.h | 1 | ||||
| -rw-r--r-- | loader/loader.c | 8 |
3 files changed, 8 insertions, 2 deletions
diff --git a/loader/kickstart.c b/loader/kickstart.c index cd06e01f5..5f09d3859 100644 --- a/loader/kickstart.c +++ b/loader/kickstart.c @@ -28,6 +28,7 @@ struct ksCommandNames ksTable[] = { { KS_CMD_NFS, "nfs" }, { KS_CMD_CDROM, "cdrom" }, { KS_CMD_HD, "harddrive" }, + { KS_CMD_TEXT, "text" }, { KS_CMD_URL, "url" }, { KS_CMD_NETWORK, "network" }, { KS_CMD_DEVICE, "device" }, diff --git a/loader/kickstart.h b/loader/kickstart.h index cdd3150a0..88f6c044e 100644 --- a/loader/kickstart.h +++ b/loader/kickstart.h @@ -8,6 +8,7 @@ #define KS_CMD_NETWORK 5 #define KS_CMD_DEVICE 6 #define KS_CMD_XDISPLAY 7 +#define KS_CMD_TEXT 8 int ksReadCommands(char * cmdFile); int ksGetCommand(int cmd, char ** last, int * argc, char *** argv); diff --git a/loader/loader.c b/loader/loader.c index b929fd766..37e3ee9ca 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1016,7 +1016,7 @@ static char * doMountImage(char * location, struct knownDevices * kd, static char * setupKickstart(char * location, struct knownDevices * kd, moduleInfoSet modInfo, moduleList modLoaded, - moduleDeps modDeps, int flags) { + moduleDeps modDeps, int * flagsPtr) { static struct networkDeviceConfig netDev; char * host = NULL, * dir = NULL, * partname = NULL; char * url = NULL, * proxy = NULL, * proxyport = NULL; @@ -1026,6 +1026,7 @@ static char * setupKickstart(char * location, struct knownDevices * kd, int ksArgc; int ksType; int i, rc, fd, partNum; + int flags = *flagsPtr; enum deviceClass ksDeviceType; struct poptOption * table; poptContext optCon; @@ -1088,6 +1089,9 @@ static char * setupKickstart(char * location, struct knownDevices * kd, setenv("DISPLAY", ksArgv[1], 1); } + if (!ksGetCommand(KS_CMD_TEXT, NULL, &ksArgc, &ksArgv)) + (*flagsPtr) = (*flagsPtr) | LOADER_FLAGS_TESTING; + if (table) { ksGetCommand(ksType, NULL, &ksArgc, &ksArgv); @@ -1408,7 +1412,7 @@ logMessage("Flags are 0x%x\n", flags); if (ksFile) { ksReadCommands(ksFile); url = setupKickstart("/mnt/source", &kd, modInfo, modLoaded, modDeps, - flags); + &flags); } if (!url) { |