svn commit: trunk/busybox/networking

[vda at busybox.net]

Author: vda
Date: 2006-09-28 15:31:51 -0700 (Thu, 28 Sep 2006)
New Revision: 16252

Log:
ifupdown: make dhcp start/stop scripts user configurable
in /etc/network/interfaces. Patch author is Gabriel L. Somlo <somlo at cmu.edu>


Modified:
   trunk/busybox/networking/ifupdown.c


Changeset:
Modified: trunk/busybox/networking/ifupdown.c
===================================================================
--- trunk/busybox/networking/ifupdown.c	2006-09-28 20:41:28 UTC (rev 16251)
+++ trunk/busybox/networking/ifupdown.c	2006-09-28 22:31:51 UTC (rev 16252)
@@ -452,6 +452,14 @@
 
 static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
 {
+	int i;
+
+	for (i = 0; i < ifd->n_options; i++) {
+		if (strcmp(ifd->option[i].name, "dhcp-start-cmd") == 0) {
+			return execute(ifd->option[i].value, ifd, exec);
+		}
+	}
+
 	if (execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i "
 			"%iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec)) return 1;
 	if (execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec)) return 1;
@@ -463,6 +471,14 @@
 
 static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
 {
+	int i;
+
+	for (i = 0; i < ifd->n_options; i++) {
+		if (strcmp(ifd->option[i].name, "dhcp-stop-cmd") == 0) {
+			return execute(ifd->option[i].value, ifd, exec);
+		}
+	}
+
 	/* SIGUSR2 forces udhcpc to release the current lease and go inactive,
 	 * and SIGTERM causes udhcpc to exit.  Signals are queued and processed
 	 * sequentially so we don't need to sleep */