[Patch] debian-installer: use of libd-i in ddetect

[thomas poindessous <poinde_t@epita.fr>]

Ok, this patch removes the use of utils.c and uses libd-i :

Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/ddetect/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile    2002/04/27 19:42:08     1.9
+++ Makefile    2002/05/07 14:59:25
@@ -1,4 +1,4 @@
-OBJS=utils.o
+OBJS=
 
 ifndef PROGS
 PROGS=ethdetect
@@ -11,8 +11,8 @@
 INSTALL=install
 STRIPTOOL=strip
 STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment 
-INCS=-I../cdebconf/src/
-LDFLAGS=-L../cdebconf/src/ -ldiscover -lisapnp -ldebconf
+INCS=-I../cdebconf/src/ -I../../libd-i/
+LDFLAGS=-L../cdebconf/debian/build/src/ -ldiscover -lisapnp -ldebconf
 -L../../libd-i/ -ld-i
 
 
 all: lst2header $(OBJS) $(PROGS)

Index: ethdetect.c
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/ddetect/ethdetect.c,v
retrieving revision 1.10
diff -u -r1.10 ethdetect.c
--- ethdetect.c 2002/05/05 13:40:18     1.10
+++ ethdetect.c 2002/05/07 15:02:42
@@ -11,7 +11,7 @@
 #include <discover.h>
 #include <debconfclient.h>
 #include <string.h>
-#include "utils.h"
+#include <d-i.h>
 #include "ddetect.h"
 #include "ethdetect.h"
 
@@ -40,7 +40,7 @@
   snprintf (buffer, sizeof (buffer), "modprobe -v %s %s", modulename,
            (params ? params : " "));
 
-  if (execlog (buffer) != 0)
+  if (di_execlog (buffer) != 0)
     {
       client->command (client, "input", "high", "ethdetect/error", NULL);
       client->command (client, "go", NULL);


-- 
Thomas Poindessous
thomas@poindessous.com



-- 
To UNSUBSCRIBE, email to debian-boot-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org