emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ifupdown: support "source" stanza in /etc/network/interfaces

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-02-28 19:01:28 +01:00
parent 41655438c6
commit fb03663619
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
networking/ifupdown.c
View File

@ -743,7 +743,7 @@ static const struct method_t *get_method(const struct address_family_t *af, char
return NULL; return NULL;
} }
static struct interfaces_file_t *read_interfaces(const char *filename) static struct interfaces_file_t *read_interfaces(const char *filename, struct interfaces_file_t *defn)
{ {
/* Let's try to be compatible. /* Let's try to be compatible.
* *
@ -758,19 +758,25 @@ static struct interfaces_file_t *read_interfaces(const char *filename)
* be ignored. Blank lines are ignored. Lines may be indented freely. * be ignored. Blank lines are ignored. Lines may be indented freely.
* A "\" character at the very end of the line indicates the next line * A "\" character at the very end of the line indicates the next line
* should be treated as a continuation of the current one. * should be treated as a continuation of the current one.
*
* Lines beginning with "source" are used to include stanzas from
* other files, so configuration can be split into many files.
* The word "source" is followed by the path of file to be sourced.
*/ */
#if ENABLE_FEATURE_IFUPDOWN_MAPPING #if ENABLE_FEATURE_IFUPDOWN_MAPPING
struct mapping_defn_t *currmap = NULL; struct mapping_defn_t *currmap = NULL;
#endif #endif
struct interface_defn_t *currif = NULL; struct interface_defn_t *currif = NULL;
struct interfaces_file_t *defn;
FILE *f; FILE *f;
char *buf; char *buf;
char *first_word; char *first_word;
char *rest_of_line; char *rest_of_line;
enum { NONE, IFACE, MAPPING } currently_processing = NONE; enum { NONE, IFACE, MAPPING } currently_processing = NONE;
if (!defn)
defn = xzalloc(sizeof(*defn)); defn = xzalloc(sizeof(*defn));
debug_noise("reading %s file:\n", filename);
f = xfopen_for_read(filename); f = xfopen_for_read(filename);
while ((buf = xmalloc_fgetline(f)) != NULL) { while ((buf = xmalloc_fgetline(f)) != NULL) {
@ -881,6 +887,8 @@ static struct interfaces_file_t *read_interfaces(const char *filename)
debug_noise("\nauto %s\n", first_word); debug_noise("\nauto %s\n", first_word);
} }
currently_processing = NONE; currently_processing = NONE;
} else if (strcmp(first_word, "source") == 0) {
read_interfaces(next_word(&rest_of_line), defn);
} else { } else {
switch (currently_processing) { switch (currently_processing) {
case IFACE: case IFACE:
@ -934,6 +942,7 @@ static struct interfaces_file_t *read_interfaces(const char *filename)
bb_error_msg_and_die("%s: I/O error", filename); bb_error_msg_and_die("%s: I/O error", filename);
} }
fclose(f); fclose(f);
debug_noise("\ndone reading %s\n\n", filename);
return defn; return defn;
} }
@ -1199,9 +1208,7 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
if (!DO_ALL) bb_show_usage(); if (!DO_ALL) bb_show_usage();
} }
debug_noise("reading %s file:\n", interfaces); defn = read_interfaces(interfaces, NULL);
defn = read_interfaces(interfaces);
debug_noise("\ndone reading %s\n\n", interfaces);
/* Create a list of interfaces to work on */ /* Create a list of interfaces to work on */
if (DO_ALL) { if (DO_ALL) {