Bug#131121: Installer puts rescue and drivers in wrong directory

[David Kimdon <dwhedon@debian.org>]

Hi,

This is my current thinking on how to fix this one.  I tested it once,
and I observed some segfaultage.  I'm not sure what the problem is,
I'll look at it later, anyway, for now:


Index: net-fetch.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/net-fetch.c,v
retrieving revision 1.51
diff -u -r1.51 net-fetch.c
--- net-fetch.c	2001/12/11 23:27:47	1.51
+++ net-fetch.c	2002/01/30 08:05:53
@@ -378,7 +378,6 @@
 {  
   int from_wget[2];
   char buf[256];
-  char localpath[128];
   pid_t pid;
   int bytes, status;
   regex_t percent;
@@ -389,8 +388,7 @@
 
   argv[0] = WGET;
   argv[1] = "-O";
-  snprintf(localpath, sizeof localpath, "%s", target_path(local_filename));
-  argv[2] = localpath;
+  argv[2] = local_filename;
   snprintf (url, sizeof url, "%s://%s:%d/%s/%s",
 	    nf_state.method, 
 	    nf_state.server.hostname, 
@@ -533,7 +531,8 @@
     if (series != files_to_fetch[i].series)
       continue;
 
-    snprintf(filename, sizeof filename - 1, "/tmp/%s", files_to_fetch[i].local);
+    snprintf(filename, sizeof filename - 1, target_path("/tmp/%s"), 
+      files_to_fetch[i].local);
 
     INFOMSG("retrieving %s from %s", filename, files_to_fetch[i].remote);
 
@@ -553,7 +552,8 @@
     if (series != files_to_fetch[i].series)
       continue;
 
-    snprintf(filename, sizeof filename - 1, "/tmp/%s", files_to_fetch[i].local);
+    snprintf(filename, sizeof filename - 1, target_path("/tmp/%s"), 
+      files_to_fetch[i].local);
 
     INFOMSG("installing %s", filename);