summaryrefslogtreecommitdiffstats
path: root/loader2/loader.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-07-28 14:54:17 +0000
committerJeremy Katz <katzj@redhat.com>2006-07-28 14:54:17 +0000
commiteaec7d78a855df560b93635e2c15146516f73dae (patch)
tree2bf857ae872e45aa97a7ee186c2d95d8d76c1681 /loader2/loader.c
parent0a8a4876b62b8275bf2cfd00e2fefecb97ef9605 (diff)
downloadanaconda-eaec7d78a855df560b93635e2c15146516f73dae.tar.gz
anaconda-eaec7d78a855df560b93635e2c15146516f73dae.tar.xz
anaconda-eaec7d78a855df560b93635e2c15146516f73dae.zip
2006-07-28 Jeremy Katz <katzj@redhat.com>
* loader2/loader.c: Don't do the trace init stuff until later -- we only want it if we're called as loader
Diffstat (limited to 'loader2/loader.c')
-rw-r--r--loader2/loader.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/loader2/loader.c b/loader2/loader.c
index a586fffee..6e9ca7d2c 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1260,7 +1260,7 @@ int nashHotplugLogger(nashContext *nc, const nash_log_level level,
int main(int argc, char ** argv) {
/* Very first thing, set up tracebacks and debug features. */
- int rc = anaconda_trace_init();
+ int rc;
struct stat sb;
struct serial_struct si;
@@ -1308,6 +1308,8 @@ int main(int argc, char ** argv) {
if (!strcmp(argv[0] + strlen(argv[0]) - 5, "rmmod"))
return ourRmmodCommand(argc, argv);
+ rc = anaconda_trace_init();
+
nashSetFirmwarePath(nc, "/firmware/:/lib/firmware/:/tmp/updates/firmware/:/tmp/product/firmware");
nashSetLogger(nc, nashHotplugLogger);