From 0832787e5c463c713d8f24fdec0f52900ff1c2bd Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 4 Aug 2016 08:16:38 -0400 Subject: Revert "Merge branch 'core-updates'" This reverts commit 455859a50f88f625d13fc2f304111f02369b366b. --- tests/guix-environment-container.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh index 12da950eba..5ea6c49263 100644 --- a/tests/guix-environment-container.sh +++ b/tests/guix-environment-container.sh @@ -65,15 +65,10 @@ mount_test_code=" (match (string-split line #\space) ;; Empty line. ((\"\") #f) - ;; Ignore the root file system. - ((_ \"/\" _ _ _ _) + ;; Ignore these types of file systems. + ((_ _ (or \"tmpfs\" \"proc\" \"sysfs\" \"devtmpfs\" + \"devpts\" \"cgroup\" \"mqueue\") _ _ _) #f) - ;; Ignore these types of file systems, except if they - ;; correspond to a parent file system. - ((_ mount (or \"tmpfs\" \"proc\" \"sysfs\" \"devtmpfs\" - \"devpts\" \"cgroup\" \"mqueue\") _ _ _) - (and (string-prefix? mount (getcwd)) - mount)) ((_ mount _ _ _ _) mount))) (string-split (call-with-input-file \"/proc/mounts\" read-string) -- cgit v1.2.3