diff options
author | startx2017 <vradu.startx@yandex.com> | 2017-04-10 09:24:00 -0400 |
---|---|---|
committer | startx2017 <vradu.startx@yandex.com> | 2017-04-10 09:24:00 -0400 |
commit | b05f7f3bd9d0264a6e143e10269e3eca5416b048 (patch) | |
tree | c14f7114ddfd89fcaa32a3ed458e150131cd07de /src/fnet | |
parent | Doc update for baloo_file profile (diff) | |
download | firejail-b05f7f3bd9d0264a6e143e10269e3eca5416b048.tar.gz firejail-b05f7f3bd9d0264a6e143e10269e3eca5416b048.tar.zst firejail-b05f7f3bd9d0264a6e143e10269e3eca5416b048.zip |
--quiet fixes
Diffstat (limited to 'src/fnet')
-rw-r--r-- | src/fnet/fnet.h | 3 | ||||
-rw-r--r-- | src/fnet/interface.c | 6 | ||||
-rw-r--r-- | src/fnet/main.c | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/fnet/fnet.h b/src/fnet/fnet.h index d6080e283..b4b7e6a37 100644 --- a/src/fnet/fnet.h +++ b/src/fnet/fnet.h | |||
@@ -26,6 +26,9 @@ | |||
26 | #include <assert.h> | 26 | #include <assert.h> |
27 | #include "../include/common.h" | 27 | #include "../include/common.h" |
28 | 28 | ||
29 | // main.c | ||
30 | extern int arg_quiet; | ||
31 | |||
29 | // veth.c | 32 | // veth.c |
30 | int net_create_veth(const char *dev, const char *nsdev, unsigned pid); | 33 | int net_create_veth(const char *dev, const char *nsdev, unsigned pid); |
31 | int net_create_macvlan(const char *dev, const char *parent, unsigned pid); | 34 | int net_create_macvlan(const char *dev, const char *parent, unsigned pid); |
diff --git a/src/fnet/interface.c b/src/fnet/interface.c index 5813db337..33ad766ec 100644 --- a/src/fnet/interface.c +++ b/src/fnet/interface.c | |||
@@ -156,8 +156,10 @@ void net_set_mtu(const char *ifname, int mtu) { | |||
156 | ifr.ifr_addr.sa_family = AF_INET; | 156 | ifr.ifr_addr.sa_family = AF_INET; |
157 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); | 157 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); |
158 | ifr.ifr_mtu = mtu; | 158 | ifr.ifr_mtu = mtu; |
159 | if (ioctl(s, SIOCSIFMTU, (caddr_t)&ifr) != 0) | 159 | if (ioctl(s, SIOCSIFMTU, (caddr_t)&ifr) != 0) { |
160 | fprintf(stderr, "Warning fnet: cannot set mtu for interface %s\n", ifname); | 160 | if (!arg_quiet) |
161 | fprintf(stderr, "Warning fnet: cannot set mtu for interface %s\n", ifname); | ||
162 | } | ||
161 | close(s); | 163 | close(s); |
162 | } | 164 | } |
163 | 165 | ||
diff --git a/src/fnet/main.c b/src/fnet/main.c index 6ec8e5f84..0c55f3141 100644 --- a/src/fnet/main.c +++ b/src/fnet/main.c | |||
@@ -18,6 +18,7 @@ | |||
18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 18 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
19 | */ | 19 | */ |
20 | #include "fnet.h" | 20 | #include "fnet.h" |
21 | int arg_quiet = 0; | ||
21 | 22 | ||
22 | static void usage(void) { | 23 | static void usage(void) { |
23 | printf("Usage:\n"); | 24 | printf("Usage:\n"); |
@@ -47,6 +48,10 @@ printf("\n"); | |||
47 | return 1; | 48 | return 1; |
48 | } | 49 | } |
49 | 50 | ||
51 | char *quiet = getenv("FIREJAIL_QUIET"); | ||
52 | if (quiet && strcmp(quiet, "yes") == 0) | ||
53 | arg_quiet = 1; | ||
54 | |||
50 | if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") ==0) { | 55 | if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") ==0) { |
51 | usage(); | 56 | usage(); |
52 | return 0; | 57 | return 0; |