diff options
| author | Mike Fulbright <msf@redhat.com> | 2002-02-04 22:00:01 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2002-02-04 22:00:01 +0000 |
| commit | ceb5b9d023a53a7107deee2fb3ab28b17b51f13d (patch) | |
| tree | 5a58a32e766ad0e8ee8a8feeb6bf19ea43011b55 /loader | |
| parent | ea82c230ff50585527573cbee910b8237c2f3647 (diff) | |
| download | anaconda-ceb5b9d023a53a7107deee2fb3ab28b17b51f13d.tar.gz anaconda-ceb5b9d023a53a7107deee2fb3ab28b17b51f13d.tar.xz anaconda-ceb5b9d023a53a7107deee2fb3ab28b17b51f13d.zip | |
fix mediacheck and CDROM installs to work
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 11 | ||||
| -rw-r--r-- | loader/mediacheck.c | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/loader/loader.c b/loader/loader.c index 97e007072..69a2d7f54 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1139,9 +1139,8 @@ static char * setupCdrom(struct installMethod * method, } } while (!gotcd1); } - - return buf; } + return buf; } } umount("/mnt/source"); @@ -1685,9 +1684,9 @@ static char * doMountImage(char * location, Red Hat CD. If there is one there, just die happy */ if (!FL_EXPERT(flags)) { # endif - url = setupCdrom(NULL, location, kd, modInfo, modLoaded, modDepsPtr, - flags, 1, 1); - if (url) return url; + url = setupCdrom(NULL, location, kd, modInfo, modLoaded, modDepsPtr, + flags, 1, 1); + if (url) return url; } #endif /* defined (INCLUDE_LOCAL) || defined (__sparc__) */ @@ -2167,6 +2166,8 @@ static int parseCmdLineFlags(int flags, char * cmdLine, char ** ksSource, flags |= LOADER_FLAGS_NOSHELL; else if (!strcasecmp(argv[i], "lowres")) flags |= LOADER_FLAGS_LOWRES; + else if (!strcasecmp(argv[i], "mediacheck")) + flags |= LOADER_FLAGS_MEDIACHECK; else if (!strcasecmp(argv[i], "nofb")) flags |= LOADER_FLAGS_NOFB; else if (!strcasecmp(argv[i], "nousbstorage")) diff --git a/loader/mediacheck.c b/loader/mediacheck.c index 04e5f56d8..00acca8c4 100644 --- a/loader/mediacheck.c +++ b/loader/mediacheck.c @@ -173,8 +173,8 @@ static void readCB(void *co, long long pos) { newtScaleSet(data->scale, pos); tick++; - if (tick >= 400) tick = 0; - *tickmark = ticks[tick % 100]; + if (tick > 399) tick = 0; + *tickmark = ticks[tick / 100]; newtLabelSetText(data->label, tickmark); newtRefresh(); |