Blame 0187-networkd-tuntap-return-correct-error-when-dev-net-tu.patch
|
 |
6b6353b |
From 6f44acfb48d4b58565d4c14714d082997389afd3 Mon Sep 17 00:00:00 2001
|
|
|
6b6353b |
From: Tom Gundersen <teg@jklm.no>
|
|
|
6b6353b |
Date: Sat, 6 Sep 2014 22:06:58 +0200
|
|
|
6b6353b |
Subject: [PATCH] networkd: tuntap - return correct error when /dev/net/tun
|
|
|
6b6353b |
cannot be opened
|
|
|
6b6353b |
|
|
|
6b6353b |
---
|
|
|
6b6353b |
src/network/networkd-netdev-tuntap.c | 10 ++++------
|
|
|
6b6353b |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
6b6353b |
|
|
|
6b6353b |
diff --git a/src/network/networkd-netdev-tuntap.c b/src/network/networkd-netdev-tuntap.c
|
|
|
6b6353b |
index eef8747210..eaf5df4971 100644
|
|
|
6b6353b |
--- a/src/network/networkd-netdev-tuntap.c
|
|
|
6b6353b |
+++ b/src/network/networkd-netdev-tuntap.c
|
|
|
6b6353b |
@@ -63,17 +63,15 @@ static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
|
|
|
6b6353b |
const char *group;
|
|
|
6b6353b |
uid_t uid;
|
|
|
6b6353b |
gid_t gid;
|
|
|
6b6353b |
- int r = 0;
|
|
|
6b6353b |
+ int r;
|
|
|
6b6353b |
|
|
|
6b6353b |
assert(netdev);
|
|
|
6b6353b |
assert(ifr);
|
|
|
6b6353b |
|
|
|
6b6353b |
fd = open(TUN_DEV, O_RDWR);
|
|
|
6b6353b |
if (fd < 0) {
|
|
|
6b6353b |
- log_error_netdev(netdev,
|
|
|
6b6353b |
- "Failed to open tun dev: %s",
|
|
|
6b6353b |
- strerror(-r));
|
|
|
6b6353b |
- return r;
|
|
|
6b6353b |
+ log_error_netdev(netdev, "Failed to open tun dev: %m");
|
|
|
6b6353b |
+ return -errno;
|
|
|
6b6353b |
}
|
|
|
6b6353b |
|
|
|
6b6353b |
r = ioctl(fd, TUNSETIFF, ifr);
|
|
|
6b6353b |
@@ -139,7 +137,7 @@ static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
|
|
|
6b6353b |
return r;
|
|
|
6b6353b |
}
|
|
|
6b6353b |
|
|
|
6b6353b |
- return r;
|
|
|
6b6353b |
+ return 0;
|
|
|
6b6353b |
}
|
|
|
6b6353b |
|
|
|
6b6353b |
static int netdev_create_tuntap(NetDev *netdev) {
|