--quiet fixes

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 @@
 #include <assert.h>
 #include "../include/common.h"
 
+// main.c
+extern int arg_quiet;
+
 // veth.c
 int net_create_veth(const char *dev, const char *nsdev, unsigned pid);
 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) {
         ifr.ifr_addr.sa_family = AF_INET;
         strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
         ifr.ifr_mtu = mtu;
-        if (ioctl(s, SIOCSIFMTU, (caddr_t)&ifr) != 0)
-                fprintf(stderr, "Warning fnet: cannot set mtu for interface %s\n", ifname);
+        if (ioctl(s, SIOCSIFMTU, (caddr_t)&ifr) != 0) {
+                if (!arg_quiet)
+                        fprintf(stderr, "Warning fnet: cannot set mtu for interface %s\n", ifname);
+        }
         close(s);
 }
 
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 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "fnet.h"
+int arg_quiet = 0;
 
 static void usage(void) {
         printf("Usage:\n");
@@ -47,6 +48,10 @@ printf("\n");
                 return 1;
         }
 
+        char *quiet = getenv("FIREJAIL_QUIET");
+        if (quiet && strcmp(quiet, "yes") == 0)
+                arg_quiet = 1;
+                
         if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") ==0) {
                 usage();
                 return 0;