diff options
author | Marius Bakke <marius@gnu.org> | 2020-11-26 01:08:35 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-11-26 01:08:35 +0100 |
commit | bff94a5a537c2c484f9f6e98cab75195c3dde9e7 (patch) | |
tree | 56c58b40471048d57e3d8650967de47e3520418c /gnu/system.scm | |
parent | c73a7f7d86c11de6649f12b749c035fd2b6fc1d0 (diff) | |
parent | f36bee1416ffb1ce1111168bca82e7d0313d65dc (diff) | |
download | guix-patches-bff94a5a537c2c484f9f6e98cab75195c3dde9e7.tar guix-patches-bff94a5a537c2c484f9f6e98cab75195c3dde9e7.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system.scm')
-rw-r--r-- | gnu/system.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index b257ea0385..fcf3310fa3 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -475,9 +475,9 @@ marked as 'needed-for-boot'." (let ((device (file-system-device fs))) (if (string? device) ;title is 'device (filter (lambda (md) - (string=? (string-append "/dev/mapper/" - (mapped-device-target md)) - device)) + (any (cut string=? device <>) + (map (cut string-append "/dev/mapper" <>) + (mapped-device-targets md)))) (operating-system-mapped-devices os)) '()))) @@ -497,11 +497,12 @@ marked as 'needed-for-boot'." (define (mapped-device-users device file-systems) "Return the subset of FILE-SYSTEMS that use DEVICE." - (let ((target (string-append "/dev/mapper/" (mapped-device-target device)))) + (let ((targets (map (cut string-append "/dev/mapper/" <>) + (mapped-device-targets device)))) (filter (lambda (fs) (or (member device (file-system-dependencies fs)) (and (string? (file-system-device fs)) - (string=? (file-system-device fs) target)))) + (any (cut string=? (file-system-device fs) <>) targets)))) file-systems))) (define (operating-system-user-mapped-devices os) |