diff options
author | Jeremy Katz <katzj@redhat.com> | 2003-08-14 02:00:12 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2003-08-14 02:00:12 +0000 |
commit | c540e134193f9759873ced09b0156c6219983101 (patch) | |
tree | b36013fe219e6c3d8762bf2a0a32b538ac5c0373 /loader2/driverdisk.c | |
parent | 3f01dfc8e9d6b8bf25b79b1cbda94ca0ff4ada09 (diff) | |
download | anaconda-c540e134193f9759873ced09b0156c6219983101.tar.gz anaconda-c540e134193f9759873ced09b0156c6219983101.tar.xz anaconda-c540e134193f9759873ced09b0156c6219983101.zip |
merge from taroon-branch. all kinds of miscellaneous bugfixes, including
* firewall update
* iSeries PReP size
* ppc mediacheck
* tzdata stuff
* cmdline mode
* pkg defaults screen
Diffstat (limited to 'loader2/driverdisk.c')
-rw-r--r-- | loader2/driverdisk.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c index 01eb920db..aa98653dd 100644 --- a/loader2/driverdisk.c +++ b/loader2/driverdisk.c @@ -115,8 +115,10 @@ static int loadDriverDisk(moduleInfoSet modInfo, moduleList modLoaded, sprintf(file, "/tmp/ramfs/DD-%d", disknum); mkdirChain(file); - startNewt(flags); - winStatus(40, 3, _("Loading"), _("Reading driver disk...")); + if (!FL_CMDLINE(flags)) { + startNewt(flags); + winStatus(40, 3, _("Loading"), _("Reading driver disk...")); + } for (fnPtr = driverDiskFiles; *fnPtr; fnPtr++) { sprintf(file, "%s/%s", mntpt, *fnPtr); @@ -138,7 +140,8 @@ static int loadDriverDisk(moduleInfoSet modInfo, moduleList modLoaded, sprintf(file, "%s/pcitable", mntpt); pciReadDrivers(file); - newtPopWindow(); + if (!FL_CMDLINE(flags)) + newtPopWindow(); disknum++; return 0; |