aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2023-03-23 10:12:39 -0400
committerLibravatar GitHub <noreply@github.com>2023-03-23 10:12:39 -0400
commit84df8aa54a936ec24160e0cc710bdb473ea4a6f1 (patch)
treeb5b28b5ad62bb7b8c3ae3fdbbc4239a5494500e5 /src
parentMerge pull request #5741 from kmk3/util-ascii-char-fns (diff)
parentfs_etc.c: fix misleading indentation (diff)
downloadfirejail-84df8aa54a936ec24160e0cc710bdb473ea4a6f1.tar.gz
firejail-84df8aa54a936ec24160e0cc710bdb473ea4a6f1.tar.zst
firejail-84df8aa54a936ec24160e0cc710bdb473ea4a6f1.zip
Merge pull request #5737 from glitsj16/private-etc-bugfix
fs_etc.c: conditionally create /etc/resolv.conf
Diffstat (limited to 'src')
-rw-r--r--src/firejail/fs_etc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c
index 3b7369ea8..dc4e5c228 100644
--- a/src/firejail/fs_etc.c
+++ b/src/firejail/fs_etc.c
@@ -111,6 +111,11 @@ char *fs_etc_build(char *str) {
111} 111}
112 112
113void fs_resolvconf(void) { 113void fs_resolvconf(void) {
114 if (arg_nonetwork) {
115 if (arg_debug)
116 printf("arg_nonetwork found (--net=none). Skip creating /etc/resolv.conf file\n");
117 return;
118 }
114 if (arg_debug) 119 if (arg_debug)
115 printf("Creating a new /etc/resolv.conf file\n"); 120 printf("Creating a new /etc/resolv.conf file\n");
116 FILE *fp = fopen(RUN_RESOLVCONF_FILE, "wxe"); 121 FILE *fp = fopen(RUN_RESOLVCONF_FILE, "wxe");