From 7bb18042ef12a4b0cb88a4e4161f527f043e64d1 Mon Sep 17 00:00:00 2001 From: Thermionix Date: Mon, 30 Sep 2013 22:44:09 +1000 Subject: [PATCH 1/2] Update archlinux.rst The /etc/sysctl.conf file is deprecated https://www.archlinux.org/news/deprecation-of-etcsysctlconf/ Upstream-commit: 88f710f0e79eafe469e09a3ea990bdbe0c7d0a52 Component: engine --- components/engine/docs/sources/installation/archlinux.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/docs/sources/installation/archlinux.rst b/components/engine/docs/sources/installation/archlinux.rst index 4f0f211747..70674837c8 100644 --- a/components/engine/docs/sources/installation/archlinux.rst +++ b/components/engine/docs/sources/installation/archlinux.rst @@ -80,7 +80,7 @@ To enable the forwarding, run as root on the host system: sysctl net.ipv4.ip_forward=1 -And, to make it persistent across reboots, enable it on the host's **/etc/sysctl.conf**: +And, to make it persistent across reboots, enable it on the host's **/etc/sysctl.d/net.conf**: :: From d8c814f4cacbed6d3870536b29ac0fedea2b3da3 Mon Sep 17 00:00:00 2001 From: Thermionix Date: Tue, 1 Oct 2013 09:33:12 +1000 Subject: [PATCH 2/2] Update archlinux.rst Upstream-commit: fb46d911c204ddda381325c5f1e43277b7b231c2 Component: engine --- components/engine/docs/sources/installation/archlinux.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/docs/sources/installation/archlinux.rst b/components/engine/docs/sources/installation/archlinux.rst index 70674837c8..a4de066f76 100644 --- a/components/engine/docs/sources/installation/archlinux.rst +++ b/components/engine/docs/sources/installation/archlinux.rst @@ -80,7 +80,7 @@ To enable the forwarding, run as root on the host system: sysctl net.ipv4.ip_forward=1 -And, to make it persistent across reboots, enable it on the host's **/etc/sysctl.d/net.conf**: +And, to make it persistent across reboots, enable it on the host's **/etc/sysctl.d/docker.conf**: ::