diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | isys/imount.c | 6 | ||||
-rw-r--r-- | loader2/loader.c | 1 |
3 files changed, 8 insertions, 3 deletions
@@ -6,6 +6,10 @@ * loader2/urls.c (urlMainSetupPanel): Fix traceback when trying to add a leading slash to paths without one (#197403, #201243, #201367). + * loader2/loader.c (main): Don't initialize method to a valid + selection, since that causes the method selection screen to never + appear. + 2006-08-03 Peter Jones <pjones@redhat.com> * gui.py (ProgressWindow): Make a timeout after which we update the diff --git a/isys/imount.c b/isys/imount.c index 14153890f..b835eb35c 100644 --- a/isys/imount.c +++ b/isys/imount.c @@ -24,7 +24,7 @@ int doPwMount(char * dev, char * where, char * fs, int options, void *data) { if (!strcmp(fs, "nfs")) isnfs = 1; - /*logMessage(INFO, "mounting %s on %s as type %s", dev, where, fs);*/ + logMessage(INFO, "mounting %s on %s as type %s", dev, where, fs); if (mkdirChain(where)) return IMOUNT_ERR_ERRNO; @@ -70,8 +70,8 @@ int doPwMount(char * dev, char * where, char * fs, int options, void *data) { mount_opt="ufstype=sun"; #endif - /*logMessage(INFO, "calling mount(%s, %s, %s, %ld, %p)", buf, where, fs, - flag, mount_opt);*/ + logMessage(INFO, "calling mount(%s, %s, %s, %ld, %p)", buf, where, fs, + flag, mount_opt); if (mount(buf, where, fs, flag, mount_opt)) { logMessage(ERROR, "mount failed: %s", strerror(errno)); diff --git a/loader2/loader.c b/loader2/loader.c index e9b854d54..1220dc0d0 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1367,6 +1367,7 @@ int main(int argc, char ** argv) { openlog("loader", 0, LOG_LOCAL0); memset(&loaderData, 0, sizeof(loaderData)); + loaderData.method = -1; extraArgs[0] = NULL; parseCmdLineFlags(&loaderData, cmdLine); |