diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/build/file-systems.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
| download | guix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: doc/guix.texi gnu/local.mk gnu/packages/admin.scm gnu/packages/base.scm gnu/packages/chromium.scm gnu/packages/compression.scm gnu/packages/databases.scm gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm
Diffstat (limited to 'gnu/build/file-systems.scm')
| -rw-r--r-- | gnu/build/file-systems.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 0ed5dc5671..66ca22d6ea 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -899,6 +899,10 @@ caught and lead to a warning and #f as the result." (format (current-error-port) "warning: failed to read from device '~a'~%" device) #f) + ((= EMEDIUMTYPE errno) ;inaccessible, like DRBD secondaries + (format (current-error-port) + "warning: failed to open device '~a'~%" device) + #f) (else (apply throw args)))))))) @@ -1123,7 +1127,7 @@ corresponds to the symbols listed in FLAGS." (('read-only rest ...) (logior MS_RDONLY (loop rest))) (('bind-mount rest ...) - (logior MS_BIND (loop rest))) + (logior MS_REC (logior MS_BIND (loop rest)))) (('no-suid rest ...) (logior MS_NOSUID (loop rest))) (('no-dev rest ...) @@ -1132,6 +1136,8 @@ corresponds to the symbols listed in FLAGS." (logior MS_NOEXEC (loop rest))) (('no-atime rest ...) (logior MS_NOATIME (loop rest))) + (('no-diratime rest ...) + (logior MS_NODIRATIME (loop rest))) (('strict-atime rest ...) (logior MS_STRICTATIME (loop rest))) (('lazy-time rest ...) |