Ack.
On Thu, 20 Jan 2011, Chris Lumens wrote:
This involves converting runKickstart to setting up the pykickstart interface
and then walking through every entry in ksTable to call the setupData
function. A later patch will change these functions to make sure there's
something for them to do before running.
---
loader/kickstart.c | 195 ++++++++++++++--------------------------------------
loader/kickstart.h | 6 +--
loader/loader.c | 6 +-
3 files changed, 54 insertions(+), 153 deletions(-)
diff --git a/loader/kickstart.c b/loader/kickstart.c
index 9fa7015..69258cf 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -247,142 +247,6 @@ static PyObject *readKickstart(PyObject *parser, PyObject *f) {
return retval;
}
-int ksReadCommands(char * cmdFile) {
- int fd;
- char * buf;
- struct stat sb;
- char * start, * end, * chptr;
- char oldch;
- int line = 0;
- gint argc = 0;
- gchar **argv = NULL;
- GError *optErr = NULL;
- int inSection = 0; /* in a section such as %post, %pre or %packages */
- struct ksCommandNames * cmd;
- int commandsAlloced = 5;
-
- if ((fd = open(cmdFile, O_RDONLY)) < 0) {
- startNewt();
- newtWinMessage(_("Kickstart Error"), _("OK"),
- _("Error opening kickstart file %s: %m"),
- cmdFile);
- return LOADER_ERROR;
- }
-
- fstat(fd, &sb);
- buf = alloca(sb.st_size + 1);
- if (read(fd, buf, sb.st_size) != sb.st_size) {
- startNewt();
- newtWinMessage(_("Kickstart Error"), _("OK"),
- _("Error reading contents of kickstart file %s: %m"),
- cmdFile);
- close(fd);
- return LOADER_ERROR;
- }
-
- close(fd);
-
- buf[sb.st_size] = '\0';
-
- commands = malloc(sizeof(*commands) * commandsAlloced);
-
- start = buf;
- while (*start && !inSection) {
- line++;
- if (!(end = strchr(start, '\n')))
- end = start + strlen(start);
-
- oldch = *end;
- *end = '\0';
-
- while (*start && isspace(*start)) start++;
-
- chptr = end - 1;
- while (chptr > start && isspace(*chptr)) chptr--;
-
- if (isspace(*chptr))
- *chptr = '\0';
- else
- *(chptr + 1) = '\0';
-
- if (!*start || *start == '#' || !strncmp(start, "%include", 8)) {
- /* keep parsing the file */
- } else if (*start == '%') {
- /* assumed - anything starting with %something is a section */
- inSection = 1;
- } else if (*chptr == '\\') {
- /* JKFIXME: this should be handled better, but at least we
- * won't segfault now */
- } else {
- if (!g_shell_parse_argv(start, &argc, &argv, &optErr) && argc) {
- newtWinMessage(_("Kickstart Error"), _("OK"),
- _("Error in %s on line %d of kickstart "
- "file %s."), argv[0], line, cmdFile);
- g_error_free(optErr);
- } else if (!argc) {
- newtWinMessage(_("Kickstart Error"), _("OK"),
- _("Missing options on line %d of kickstart "
- "file %s."), line, cmdFile);
- } else {
- for (cmd = ksTable; cmd->name; cmd++)
- if (!strcmp(cmd->name, argv[0])) break;
-
- if (cmd->name) {
- if (numCommands == commandsAlloced) {
- commandsAlloced += 5;
- commands = realloc(commands,
- sizeof(*commands) * commandsAlloced);
- }
-
- commands[numCommands].code = cmd->code;
- commands[numCommands].argc = argc;
- commands[numCommands].argv = argv;
- numCommands++;
- }
- }
- }
-
- if (oldch)
- start = end + 1;
- else
- start = end;
- }
-
- return 0;
-}
-
-
-int ksHasCommand(int cmd) {
- int i;
-
- for(i = 0; i < numCommands; i++)
- if (commands[i].code == cmd) return 1;
-
- return 0;
-}
-
-int ksGetCommand(int cmd, char ** last, int * argc, char *** argv) {
- int i = 0;
-
- if (last) {
- for (i = 0; i < numCommands; i++) {
- if (commands[i].argv == last) break;
- }
-
- i++;
- }
-
- for (; i < numCommands; i++) {
- if (commands[i].code == cmd) {
- if (argv) *argv = commands[i].argv;
- if (argc) *argc = commands[i].argc;
- return 0;
- }
- }
-
- return 1;
-}
-
int kickstartFromRemovable(char *kssrc) {
struct device ** devices;
char *p, *kspath;
@@ -725,17 +589,60 @@ static void setMediaCheck(struct loaderData_s * loaderData, int argc,
return;
}
-void runKickstart(struct loaderData_s * loaderData) {
- struct ksCommandNames * cmd;
- int argc;
- char ** argv;
+int runKickstart(struct loaderData_s * loaderData, const char *file) {
+ PyObject *versionMod, *parserMod = NULL;
+ PyObject *handler, *parser;
+ PyObject *processedFile;
+ int rc = 0;
+
+ PyObject *callable = NULL;
logMessage(INFO, "setting up kickstart");
- for (cmd = ksTable; cmd->name; cmd++) {
- if ((!ksGetCommand(cmd->code, NULL, &argc, &argv)) && cmd->setupData) {
- cmd->setupData(loaderData, argc, argv);
- }
+
+ Py_Initialize();
+
+ if ((versionMod = import("pykickstart.version")) == NULL)
+ goto quit;
+
+ if ((parserMod = import("pykickstart.parser")) == NULL)
+ goto quit;
+
+ /* make the KickstartHandler object */
+ if ((handler = makeHandler(versionMod)) == NULL)
+ goto quit;
+
+ /* make the KickstartParser object */
+ if ((callable = getCallable(parserMod, "KickstartParser")) == NULL)
+ goto quit;
+ else
+ parser = makeParser(callable, handler);
+
+ /* call preprocessKickstart */
+ processedFile = preprocessKickstart(parserMod, file);
+
+ /* call readKickstart */
+ if (processedFile) {
+ struct ksCommandNames *cmd;
+
+ if (!readKickstart(parser, processedFile))
+ goto quit;
+
+ /* Now handler is set up with all the kickstart data. Run through
+ * every element of the ksTable and run its function. The functions
+ * themselves will decide if they should do anything or not.
+ */
+ for (cmd = ksTable; cmd->name; cmd++)
+ cmd->setupData(loaderData, 0, NULL);
}
+
+ rc = 1;
+
+quit:
+ Py_XDECREF(versionMod);
+ Py_XDECREF(callable);
+ Py_XDECREF(parserMod);
+ Py_Finalize();
+ return rc;
}
/* vim:set sw=4 sts=4 et: */
diff --git a/loader/kickstart.h b/loader/kickstart.h
index eb1ffb2..80f91d1 100644
--- a/loader/kickstart.h
+++ b/loader/kickstart.h
@@ -42,13 +42,9 @@
#define KS_CMD_UPDATES 18
#define KS_CMD_VNC 19
-int ksReadCommands(char * cmdFile);
-int ksGetCommand(int cmd, char ** last, int * argc, char *** argv);
-int ksHasCommand(int cmd);
-
int isKickstartFileRemote(char *ksFile);
void getKickstartFile(struct loaderData_s * loaderData);
-void runKickstart(struct loaderData_s * loaderData);
+int runKickstart(struct loaderData_s * loaderData, const char *file);
int getKickstartFromBlockDevice(char *device, char *path);
void loadKickstartModule(struct loaderData_s *, int, char **);
diff --git a/loader/loader.c b/loader/loader.c
index b4e6aaf..e980913 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -2138,10 +2138,8 @@ int main(int argc, char ** argv) {
if (!ksFile)
getKickstartFile(&loaderData);
- if (FL_KICKSTART(flags) &&
- (ksReadCommands((ksFile)?ksFile:loaderData.ksFile)!=LOADER_ERROR)) {
- runKickstart(&loaderData);
- }
+ if (FL_KICKSTART(flags))
+ runKickstart(&loaderData, (ksFile)?ksFile:loaderData.ksFile);
}
if (FL_EARLY_NETWORKING(flags)) {
--
David Cantrell <dcantrell@xxxxxxxxxx>
Supervisor, Installer Engineering Team
Red Hat, Inc. | Honolulu, HI | UTC-10
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
