changeset 983:1f2ad84ae760 draft

Fix reboot timeout in dhcpcd.conf.
author Roy Marples <roy@marples.name>
date Mon, 15 Sep 2008 16:43:27 +0000
parents b8b5d9059bb0
children bdfda4828382
files if-options.c if-options.h
diffstat 2 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/if-options.c	Mon Sep 15 15:23:46 2008 +0000
+++ b/if-options.c	Mon Sep 15 16:43:27 2008 +0000
@@ -46,10 +46,6 @@
 #include "if-options.h"
 #include "net.h"
 
-/* Don't set any optional arguments here so we retain POSIX
- * compatibility with getopt */
-#define OPTS "bc:df:h:i:kl:m:no:pqr:s:t:u:v:xy:z:ABC:DEF:GI:KLO:Q:TVX:Z:"
-
 const struct option cf_options[] = {
 	{"background",      no_argument,       NULL, 'b'},
 	{"script",          required_argument, NULL, 'c'},
--- a/if-options.h	Mon Sep 15 15:23:46 2008 +0000
+++ b/if-options.h	Mon Sep 15 16:43:27 2008 +0000
@@ -37,7 +37,7 @@
 
 /* Don't set any optional arguments here so we retain POSIX
  * compatibility with getopt */
-#define IF_OPTS "bc:df:h:i:kl:m:no:pqr:s:t:u:v:xz:ABC:DEF:GI:KLO:Q:TVX:Z:"
+#define IF_OPTS "bc:df:h:i:kl:m:no:pqr:s:t:u:v:xy:z:ABC:DEF:GI:KLO:Q:TVX:Z:"
 
 #define DEFAULT_TIMEOUT		30
 #define DEFAULT_REBOOT		10