From: Daniel Hokka Zakrisson Date: Thu, 28 Feb 2008 23:54:32 +0000 (+0000) Subject: Set persist last, this way, no interface is left behind if one of the ioctls fail. X-Git-Tag: release-0.30.215~19 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ccc41ab34bc162da50e9b2ebf72f3aa89a05566;p=util-vserver.git Set persist last, this way, no interface is left behind if one of the ioctls fail. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2688 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/src/tunctl.c b/src/tunctl.c index ba695b5..6fe8a81 100644 --- a/src/tunctl.c +++ b/src/tunctl.c @@ -134,8 +134,6 @@ doTunctl(struct Arguments *args, char *interface) ifr.ifr_flags = args->type; EioctlD(fd, TUNSETIFF, &ifr); - if (args->set & (CMD_PERSIST|CMD_NOPERSIST)) - EioctlD(fd, TUNSETPERSIST, (void *) (long) args->persist); if (args->set & (CMD_CSUM|CMD_NOCSUM)) EioctlD(fd, TUNSETNOCSUM, (void *) (long) !args->checksum); if (args->set & CMD_UID) @@ -146,6 +144,8 @@ doTunctl(struct Arguments *args, char *interface) EioctlD(fd, TUNSETNID, (void *) (long) args->nid); if (args->set & CMD_LINKTYPE) EioctlD(fd, TUNSETLINK, (void *) (long) args->linktype); + if (args->set & (CMD_PERSIST|CMD_NOPERSIST)) + EioctlD(fd, TUNSETPERSIST, (void *) (long) args->persist); close(fd); }