From 4c251fb593801dc150883385247fd4848800d792 Mon Sep 17 00:00:00 2001
From: Robert Swiecki <robert@swiecki.net>
Date: Fri, 1 Jun 2018 12:17:27 +0200
Subject: [PATCH] configs: updated and synchronized for firefox

---
 configs/firefox-with-cloned-net.cfg | 13 +++++++++++++
 configs/firefox-with-net.cfg        | 37 ++++++++++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/configs/firefox-with-cloned-net.cfg b/configs/firefox-with-cloned-net.cfg
index b753ad9..b4a8260 100644
--- a/configs/firefox-with-cloned-net.cfg
+++ b/configs/firefox-with-cloned-net.cfg
@@ -49,6 +49,7 @@ gidmap {
 mount {
 	dst: "/proc"
 	fstype: "proc"
+	rw: true
 }
 
 mount {
@@ -101,6 +102,11 @@ mount {
 }
 
 mount {
+	src_content: "01020304050607080910111213141516"
+	dst: "/etc/machine-id"
+}
+
+mount {
 	src: "/dev/urandom"
 	dst: "/dev/urandom"
 	is_bind: true
@@ -108,6 +114,13 @@ mount {
 }
 
 mount {
+	src: "/dev/null"
+	dst: "/dev/null"
+	is_bind: true
+	rw: true
+}
+
+mount {
 	src_content: "nameserver 8.8.8.8"
 	dst: "/etc/resolv.conf"
 }
diff --git a/configs/firefox-with-net.cfg b/configs/firefox-with-net.cfg
index 6691432..f487782 100644
--- a/configs/firefox-with-net.cfg
+++ b/configs/firefox-with-net.cfg
@@ -28,11 +28,20 @@ rlimit_cpu: 1000
 rlimit_fsize: 1024
 rlimit_nofile: 512
 
-clone_newnet: false
+uidmap {
+	inside_id: "9999999"
+	outside_id: "jagger"
+}
+
+gidmap {
+	inside_id: "9999999"
+	outside_id: "jagger"
+}
 
 mount {
 	dst: "/proc"
 	fstype: "proc"
+	rw: true
 }
 
 mount {
@@ -74,17 +83,22 @@ mount {
 }
 
 mount {
-    src_content: "<?xml version=\"1.0\"?>\n<!DOCTYPE fontconfig SYSTEM \"fonts.dtd\">\n<fontconfig><dir>/usr/share/fonts</dir><cachedir>/tmp/fontconfig</cachedir></fontconfig>"
-    dst: "/etc/fonts/fonts.conf"
-}
-
-mount {
 	src: "/usr/share"
 	dst: "/usr/share"
 	is_bind: true
 }
 
 mount {
+	src_content: "<?xml version=\"1.0\"?>\n<!DOCTYPE fontconfig SYSTEM \"fonts.dtd\">\n<fontconfig><dir>/usr/share/fonts</dir><cachedir>/tmp/fontconfig</cachedir></fontconfig>"
+	dst: "/etc/fonts/fonts.conf"
+}
+
+mount {
+	src_content: "01020304050607080910111213141516"
+	dst: "/etc/machine-id"
+}
+
+mount {
 	src: "/dev/urandom"
 	dst: "/dev/urandom"
 	is_bind: true
@@ -92,10 +106,15 @@ mount {
 }
 
 mount {
-	src: "/etc/resolv.conf"
-	dst: "/etc/resolv.conf"
+	src: "/dev/null"
+	dst: "/dev/null"
 	is_bind: true
-	mandatory: false
+	rw: true
+}
+
+mount {
+	src_content: "nameserver 8.8.8.8"
+	dst: "/etc/resolv.conf"
 }
 
 mount {
-- 
2.7.4