diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-08-01 23:30:52 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-08-01 23:30:52 +0200 |
| commit | 455859a50f88f625d13fc2f304111f02369b366b (patch) | |
| tree | 285d8aa9253f033fa8d64e6b5f9f8d856aae04d2 /tests | |
| parent | 742effef5629667b274087adc70b06abab86b252 (diff) | |
Merge branch 'core-updates'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-environment-container.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh index 5ea6c49263..12da950eba 100644 --- a/tests/guix-environment-container.sh +++ b/tests/guix-environment-container.sh @@ -65,10 +65,15 @@ mount_test_code=" (match (string-split line #\space) ;; Empty line. ((\"\") #f) - ;; Ignore these types of file systems. - ((_ _ (or \"tmpfs\" \"proc\" \"sysfs\" \"devtmpfs\" - \"devpts\" \"cgroup\" \"mqueue\") _ _ _) + ;; Ignore the root file system. + ((_ \"/\" _ _ _ _) #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) |