summaryrefslogtreecommitdiff
path: root/gnu/build
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-01-28 21:07:42 +0100
committerLudovic Courtès <ludo@gnu.org>2015-01-28 21:32:58 +0100
commit01ed3c4fe54548ca0c2848c4ecee3525c7dabc36 (patch)
treeb21b90fdc14c4339bea99ca24f92535715b227b6 /gnu/build
parent9250b30466c17747a32f215551ded8dc52bc2c32 (diff)
downloadpatches-01ed3c4fe54548ca0c2848c4ecee3525c7dabc36.tar
patches-01ed3c4fe54548ca0c2848c4ecee3525c7dabc36.tar.gz
linux-boot: Don't fail if /root/etc/mtab is a dangling symlink.
Reported Joshua Grant. Patch suggested by Mark H Weaver. * gnu/build/linux-boot.scm (mount-root-file-system): Use 'false-if-exception' instead of 'when (file-exists? ...)' to account for dangling symlinks.
Diffstat (limited to 'gnu/build')
-rw-r--r--gnu/build/linux-boot.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 3096989468..f54e3d3a35 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -276,7 +276,7 @@ UNIONFS."
(mount root "/root" type)))
;; Make sure /root/etc/mtab is a symlink to /proc/self/mounts.
- (when (file-exists? "/root/etc/mtab")
+ (false-if-exception
(delete-file "/root/etc/mtab"))
(symlink "/proc/self/mounts" "/root/etc/mtab"))