From 7676faaf98417792917c750d3bb215ff71a126b6 Mon Sep 17 00:00:00 2001
From: Gerald E Butler <gerald.edward.butler@gmail.com>
Date: Mon, 13 Nov 2017 17:52:08 -0500
Subject: [PATCH 1/4] Corrected filesystem.toml to correctly soft-link folders
 in /usr to folders in / so as to avoid infinite recursiong with 'ls -lR /' as
 per https://github.com/redox-os/redox/issues/1102

---
 filesystem.toml | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/filesystem.toml b/filesystem.toml
index 0dda69f..671d0a6 100644
--- a/filesystem.toml
+++ b/filesystem.toml
@@ -175,6 +175,32 @@ Welcome to Redox OS!
 """
 
 [[files]]
-path = "/usr"
-data = "/"
+path = "/usr/bin"
+data = "/bin"
 symlink = true
+
+[[files]]
+path = "/usr/sbin"
+data = "/sbin"
+symlink = true
+
+[[files]]
+path = "/usr/var"
+data = "/var"
+symlink = true
+
+[[files]]
+path = "/usr/share"
+data = "/share"
+symlink = true
+
+[[files]]
+path = "/usr/include"
+data = "/include"
+symlink = true
+
+[[files]]
+path = "/usr/lib"
+data = "/lib"
+symlink = true
+

From d7e5552be54a3c35da36f3ec7ebaa19c41055fef Mon Sep 17 00:00:00 2001
From: Gerald E Butler <gerald.edward.butler@gmail.com>
Date: Mon, 13 Nov 2017 18:54:23 -0500
Subject: [PATCH 2/4] Revert "Corrected filesystem.toml to correctly soft-link
 folders in /usr to folders in / so as to avoid infinite recursiong with 'ls
 -lR /' as per https://github.com/redox-os/redox/issues/1102"

This reverts commit 7676faaf98417792917c750d3bb215ff71a126b6.
---
 filesystem.toml | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/filesystem.toml b/filesystem.toml
index 671d0a6..0dda69f 100644
--- a/filesystem.toml
+++ b/filesystem.toml
@@ -175,32 +175,6 @@ Welcome to Redox OS!
 """
 
 [[files]]
-path = "/usr/bin"
-data = "/bin"
+path = "/usr"
+data = "/"
 symlink = true
-
-[[files]]
-path = "/usr/sbin"
-data = "/sbin"
-symlink = true
-
-[[files]]
-path = "/usr/var"
-data = "/var"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "/share"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "/include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "/lib"
-symlink = true
-

From 709ca99eae56f422d4412746b9ee18ed9794a7f4 Mon Sep 17 00:00:00 2001
From: Gerald E Butler <gerald.edward.butler@gmail.com>
Date: Mon, 13 Nov 2017 19:01:18 -0500
Subject: [PATCH 3/4] Corrected filesystem.toml to correctly soft-link folders
 in /usr to folders in / so as to avoid infinite recursiong with 'ls -lR /' as
 per https://github.com/redox-os/redox/issues/1102

---
 filesystem.toml | 55 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/filesystem.toml b/filesystem.toml
index 0dda69f..648468d 100644
--- a/filesystem.toml
+++ b/filesystem.toml
@@ -175,6 +175,57 @@ Welcome to Redox OS!
 """
 
 [[files]]
-path = "/usr"
-data = "/"
+path = "/usr/filesystem.toml"
+data = "/filesystem.toml"
 symlink = true
+
+[[files]]
+path = "/usr/bin"
+data = "/bin"
+symlink = true
+
+[[files]]
+path = "/usr/bootloader"
+data = "/bootloader"
+symlink = true
+
+[[files]]
+path = "/usr/etc"
+data = "/etc"
+symlink = true
+
+[[files]]
+path = "/usr/home"
+data = "/home"
+symlink = true
+
+[[files]]
+path = "/usr/kernel"
+data = "/kernel"
+symlink = true
+
+[[files]]
+path = "/usr/pkg"
+data = "/pkg"
+symlink = true
+
+[[files]]
+path = "/usr/ref"
+data = "/ref"
+symlink = true
+
+[[files]]
+path = "/usr/root"
+data = "/root"
+symlink = true
+
+[[files]]
+path = "/usr/tmp"
+data = "/tmp"
+symlink = true
+
+[[files]]
+path = "/usr/ui"
+data = "/ui"
+symlink = true
+

From 7165b19efbccc12a6e66031497c73600d373ab4a Mon Sep 17 00:00:00 2001
From: Gerald E Butler <gerald.edward.butler@gmail.com>
Date: Mon, 13 Nov 2017 19:37:56 -0500
Subject: [PATCH 4/4] Corrected filesystem.toml to correctly soft-link folders
 in /usr to folders in / so as to avoid infinite recursiong with 'ls -lR /' as
 per https://github.com/redox-os/redox/issues/1102

---
 filesystem.toml | 50 -------------------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/filesystem.toml b/filesystem.toml
index 648468d..ea23a01 100644
--- a/filesystem.toml
+++ b/filesystem.toml
@@ -174,58 +174,8 @@ Welcome to Redox OS!
 
 """
 
-[[files]]
-path = "/usr/filesystem.toml"
-data = "/filesystem.toml"
-symlink = true
-
 [[files]]
 path = "/usr/bin"
 data = "/bin"
 symlink = true
 
-[[files]]
-path = "/usr/bootloader"
-data = "/bootloader"
-symlink = true
-
-[[files]]
-path = "/usr/etc"
-data = "/etc"
-symlink = true
-
-[[files]]
-path = "/usr/home"
-data = "/home"
-symlink = true
-
-[[files]]
-path = "/usr/kernel"
-data = "/kernel"
-symlink = true
-
-[[files]]
-path = "/usr/pkg"
-data = "/pkg"
-symlink = true
-
-[[files]]
-path = "/usr/ref"
-data = "/ref"
-symlink = true
-
-[[files]]
-path = "/usr/root"
-data = "/root"
-symlink = true
-
-[[files]]
-path = "/usr/tmp"
-data = "/tmp"
-symlink = true
-
-[[files]]
-path = "/usr/ui"
-data = "/ui"
-symlink = true
-