X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fvserver-start%2Finterface-read.c;h=d04b7ae54b154713571ead84448fd0402b235603;hb=41815c3a043fd94adcbf54e52ee891a3e44313fa;hp=1d725183842d184a7ca5c85567501ec2921331c4;hpb=e3be43e3ee2157a63ea175463629c2433f595854;p=util-vserver.git diff --git a/util-vserver/vserver-start/interface-read.c b/util-vserver/vserver-start/interface-read.c index 1d72518..d04b7ae 100644 --- a/util-vserver/vserver-start/interface-read.c +++ b/util-vserver/vserver-start/interface-read.c @@ -46,7 +46,7 @@ assumeNonNull(PathInfo const *cfgdir, char const *file, char const *val) if (val!=0) return 0; WRITE_MSG(2, "vserver-start: no value configured for '"); - write(2, cfgdir->d, cfgdir->l); + Vwrite (2, cfgdir->d, cfgdir->l); WRITE_MSG(2, "/"); WRITE_STR(2, file); WRITE_STR(2, "'\n"); @@ -64,6 +64,9 @@ Iface_read(struct Interface *res, PathInfo *cfgdir, char const * bcast; bool rc = false; + // skip 'disabled' interfaces + if (readEntryFlag(cfgdir, "disabled", false)) return true; + ip = readEntryStr (cfgdir, "ip", 0); mask = readEntryStr (cfgdir, "mask", 0); prefix = readEntryStr (cfgdir, "prefix", 0); @@ -88,7 +91,7 @@ Iface_read(struct Interface *res, PathInfo *cfgdir, if (mask && prefix) { WRITE_MSG(2, "vserver-start: both 'prefix' and 'mask' specified in '"); - write(2, cfgdir->d, cfgdir->l); + Vwrite (2, cfgdir->d, cfgdir->l); WRITE_MSG(2, "'\n"); goto err; } @@ -106,7 +109,7 @@ Iface_read(struct Interface *res, PathInfo *cfgdir, int p = atoi(prefix); if (p==0) { WRITE_MSG(2, "vserver-start: invalid 'prefix' specified in '"); - write(2, cfgdir->d, cfgdir->l); + Vwrite (2, cfgdir->d, cfgdir->l); WRITE_MSG(2, "'\n"); goto err; }