[klibc] [patch] ipconfig add dhcp file preseeding support

[Geert Stappers]

On Mon, Jul 24, 2006 at 03:46:06PM -0700, H. Peter Anvin wrote:
> Geert Stappers wrote:
> >
> > Could some one spend some time on feedback for it?
> > A simple 'applied' (or 'rejected' ) will do.
> >
>
> OLS was last week, so I'm a week behind.  Looks fine; I'll apply it
> later today, probably.

Attached the filename patch with cosmitic changes.
 * filename in lowercase and value between quotes
 * s/from RFC 2131, DHCP/from DHCP  RFC 2131/
 * patch generated by `git diff`


Cheers
Geert Stappers
-------------- next part --------------
diff --git a/usr/kinit/ipconfig/bootp_proto.c b/usr/kinit/ipconfig/bootp_proto.c
index 137847c..59b03b4 100644
--- a/usr/kinit/ipconfig/bootp_proto.c
+++ b/usr/kinit/ipconfig/bootp_proto.c
@@ -74,6 +74,7 @@ int bootp_parse(struct netdev *dev, stru
 	dev->hostname[0]	= '\0';
 	dev->nisdomainname[0]	= '\0';
 	dev->bootpath[0]	= '\0';
+	memcpy(&dev->filename, &hdr->boot_file, FNLEN);
 
 	if (extlen >= 4 && exts[0] == 99 && exts[1] == 130 &&
 	    exts[2] == 83 && exts[3] == 99) {
diff --git a/usr/kinit/ipconfig/main.c b/usr/kinit/ipconfig/main.c
index 4f2d0e0..48b01a5 100644
--- a/usr/kinit/ipconfig/main.c
+++ b/usr/kinit/ipconfig/main.c
@@ -71,6 +71,7 @@ static void print_device_config(struct n
 		printf(" nisdomain: %-64s\n", dev->nisdomainname);
 	printf(" rootserver: %s ", my_inet_ntoa(dev->ip_server));
 	printf("rootpath: %s\n", dev->bootpath);
+	printf(" filename  : %s\n", dev->filename);
 }
 
 static void configure_device(struct netdev *dev)
@@ -116,6 +117,7 @@ static void dump_device_config(struct ne
 		fprintf(f, "NISDOMAIN=%s\n", dev->nisdomainname);
 		fprintf(f, "ROOTSERVER=%s\n", my_inet_ntoa(dev->ip_server));
 		fprintf(f, "ROOTPATH=%s\n", dev->bootpath);
+		fprintf(f, "filename=\"%s\"\n", dev->filename);
 		fclose(f);
 	}
 }
diff --git a/usr/kinit/ipconfig/netdev.h b/usr/kinit/ipconfig/netdev.h
index ac8c8be..99c433a 100644
--- a/usr/kinit/ipconfig/netdev.h
+++ b/usr/kinit/ipconfig/netdev.h
@@ -9,6 +9,7 @@ #include <sys/utsname.h>
 #include <net/if.h>
 
 #define BPLEN		40
+#define FNLEN		128			/* from DHCP  RFC 2131 */
 
 struct netdev {
 	const char *name;	/* Device name          */
@@ -42,6 +43,7 @@ struct netdev {
 	char dnsdomainname[SYS_NMLN];	/* dns domain name      */
 	char nisdomainname[SYS_NMLN];	/* nis domain name      */
 	char bootpath[BPLEN];	/* boot path            */
+	char filename[FNLEN];   /* filename             */
 	struct netdev *next;	/* next configured i/f  */
 };